Skip to content

Commit

Permalink
Merge branch 'opensearch-project:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
gaiksaya authored Jun 20, 2024
2 parents 3887bd5 + f7cdddd commit 511b951
Show file tree
Hide file tree
Showing 88 changed files with 16,811 additions and 14,962 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ module.exports = {
'max-classes-per-file': 'off',
'no-unused-vars': 'off',
'no-new': 'off',
'max-len': ['error', 160],
'max-len': ['error', { 'code': 160, 'ignoreComments': true }],
},
};
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @opensearch-project/engineering-effectiveness
* @peterzhuamazon @gaiksaya @rishabh6788 @zelinh @prudhvigodithi @Divyaasm
19 changes: 19 additions & 0 deletions .github/workflows/add-untriaged.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Apply 'untriaged' label during issue lifecycle

on:
issues:
types: [opened, reopened, transferred]

jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
with:
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['untriaged']
})
3 changes: 3 additions & 0 deletions .github/workflows/cdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ jobs:
- name: Run CDK Build and Test
run: |
npm install
cd resources/cf-url-rewriter
npm install
cd -
npm run build
18 changes: 0 additions & 18 deletions .github/workflows/dco.yml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Push new jenkins docker image

on:
push:
paths:
- docker/**

jobs:
docker:
runs-on: ubuntu-latest
steps:
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v2
with:
platforms: linux/amd64,linux/arm64
context: "{{defaultContext}}:docker"
push: true
tags: opensearchstaging/jenkins:2.426.3-lts-jdk21,opensearchstaging/jenkins:latest
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@
!jest.config.js
*.d.ts
node_modules
.DS_Store
# We do not want to track this file as it is generated only if user provides certain params.
resources/jenkins.yaml


# CDK asset staging directory
.cdk.staging
cdk.out

cdk.context.json
# excluding intellij Idea files
*.iml
.idea/
.vscode/
22 changes: 22 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"scanSettings": {
"configMode": "AUTO",
"configExternalURL": "",
"projectToken": "",
"baseBranches": []
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure",
"displayMode": "diff",
"useMendCheckNames": true
},
"issueSettings": {
"minSeverityLevel": "LOW",
"issueType": "DEPENDENCY"
},
"remediateSettings": {
"workflowRules": {
"enabled": true
}
}
}
28 changes: 20 additions & 8 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
## Maintainers
## Overview

| Maintainer | GitHub ID | Affiliation |
| ---------------- | --------------------------------------------------- | ----------- |
This document contains a list of maintainers in this repo. See [opensearch-project/.github/RESPONSIBILITIES.md](https://github.com/opensearch-project/.github/blob/main/RESPONSIBILITIES.md#maintainer-responsibilities) that explains what the role of maintainer means, what maintainers do in this and other repos, and how they should be doing it. If you're interested in contributing, and becoming a maintainer, see [CONTRIBUTING](CONTRIBUTING.md).

## Current Maintainers

| Maintainer | GitHub ID | Affiliation |
| ---------------- |------------------------------------------| ----------- |
| Peter Zhu | [peterzhuamazon](https://github.com/peterzhuamazon) | Amazon |
| Barani Bikshandi | [bbarani](https://github.com/bbarani) | Amazon |
| Sayali Gaikawad | [gaiksaya](https://github.com/gaiksaya) | Amazon |
| Abhinav Gupta | [abhinavGupta16](https://github.com/abhinavGupta16) | Amazon |
| Zelin Hao | [zelinh](https://github.com/zelinh) | Amazon |
| Sayali Gaikawad | [gaiksaya](https://github.com/gaiksaya) | Amazon |
| Rishab Singh | [rishabh6788](https://github.com/rishabh6788) | Amazon |
| Zelin Hao | [zelinh](https://github.com/zelinh) | Amazon |
| Prudhvi Godithi | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon |
| Divya Madala | [Divyaasm](https://github.com/Divyaasm) | Amazon |

## Emeritus

[This document](https://github.com/opensearch-project/.github/blob/main/MAINTAINERS.md) explains what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
| Maintainer | GitHub ID | Affiliation |
| ------------- | --------------------------------------------------- | ----------- |
| Peter Nied | [peternied](https://github.com/peternied) | Amazon |
| Abhinav Gupta | [abhinavGupta16](https://github.com/abhinavGupta16) | Amazon |
| Jeff Lu | [jordarlu](https://github.com/jordarlu) | Amazon |
| Barani Bikshandi | [bbarani](https://github.com/bbarani) | Amazon |
Loading

0 comments on commit 511b951

Please sign in to comment.