Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #6

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/DISCUSSION_TEMPLATE/adopters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body:
- type: textarea
id: info
attributes:
label: "[Optional] Can you provide us with a quote on your favourite part of Tunnel? This may be used on the tunnel.dev website, posted on Twitter (@AquaTunnel) or similar marketing material."
label: "[Optional] Can you provide us with a quote on your favourite part of Tunnel? This may be used on the tunnel.dev website, posted on Twitter (@KhulnaSoftTunnel) or similar marketing material."
validations:
required: false
- type: checkboxes
Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ updates:
schedule:
interval: weekly
ignore:
- dependency-name: "github.com/aquasecurity/tunnel-*" ## `tunnel-*` dependencies are updated manually
- dependency-name: "github.com/khulnasoft/tunnel-*" ## `tunnel-*` dependencies are updated manually
groups:
aws:
patterns:
Expand All @@ -36,6 +36,6 @@ updates:
- "github.com/testcontainers/*"
common:
exclude-patterns:
- "github.com/aquasecurity/tunnel-*"
- "github.com/khulnasoft/tunnel-*"
patterns:
- "*"
6 changes: 3 additions & 3 deletions .github/workflows/auto-update-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
go-version: ${{ env.GO_VERSION }}
cache: false

- name: Install aqua tools
uses: aquaproj/aqua[email protected]
- name: Install khulnasoft tools
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
khulnasoft_version: v1.25.0

- name: update labels
env:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/backport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
else
echo "is_maintainer=false" >> $GITHUB_OUTPUT
fi


backport:
name: Backport PR
Expand All @@ -31,9 +30,8 @@ jobs:
needs.check_permission.outputs.is_maintainer == 'true' &&
github.event.issue.pull_request &&
github.event.issue.pull_request.merged_at != null &&
startsWith(github.event.comment.body, '@aqua-bot backport release/')
startsWith(github.event.comment.body, '@khulnasoft-bot backport release/')
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -42,7 +40,7 @@ jobs:

- name: Extract branch name
run: |
BRANCH_NAME=$(echo ${{ github.event.comment.body }} | grep -oE '@aqua-bot backport\s+(\S+)' | awk '{print $3}')
BRANCH_NAME=$(echo ${{ github.event.comment.body }} | grep -oE '@khulnasoft-bot backport\s+(\S+)' | awk '{print $3}')
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV

- name: Set up Git user
Expand All @@ -55,4 +53,4 @@ jobs:
env:
# Use ORG_REPO_TOKEN instead of GITHUB_TOKEN
# This allows the created PR to trigger tests and other workflows
GITHUB_TOKEN: ${{ secrets.ORG_REPO_TOKEN }}
GITHUB_TOKEN: ${{ secrets.ORG_REPO_TOKEN }}
16 changes: 7 additions & 9 deletions .github/workflows/cache-test-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
cache: false

- name: Install tools
uses: aquaproj/aqua[email protected]
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
khulnasoft_version: v1.25.0

- name: Generate image list digest
if: github.ref_name == 'main'
Expand All @@ -39,8 +39,7 @@ jobs:
with:
path: integration/testdata/fixtures/images
key: cache-test-images-${{ steps.image-digest.outputs.digest }}
restore-keys:
cache-test-images-
restore-keys: cache-test-images-

- name: Download test images
if: github.ref_name == 'main'
Expand All @@ -60,9 +59,9 @@ jobs:
cache: false

- name: Install tools
uses: aquaproj/aqua[email protected]
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
khulnasoft_version: v1.25.0

- name: Generate image list digest
if: github.ref_name == 'main'
Expand All @@ -80,9 +79,8 @@ jobs:
with:
path: integration/testdata/fixtures/vm-images
key: cache-test-vm-images-${{ steps.image-digest.outputs.digest }}
restore-keys:
cache-test-vm-images-
restore-keys: cache-test-vm-images-

- name: Download test VM images
if: github.ref_name == 'main'
run: mage test:fixtureVMImages
run: mage test:fixtureVMImages
4 changes: 2 additions & 2 deletions .github/workflows/mkdocs-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Deploy the dev documentation
on:
push:
paths:
- 'docs/**'
- "docs/**"
- mkdocs.yml
branches:
- main
Expand All @@ -25,7 +25,7 @@ jobs:
pip install git+https://${GH_TOKEN}@github.com/squidfunk/[email protected]
pip install -r docs/build/requirements.txt
env:
GH_TOKEN: ${{ secrets.MKDOCS_AQUA_BOT }}
GH_TOKEN: ${{ secrets.MKDOCS_KHULNASOFT_BOT }}
- name: Configure the git user
run: |
git config user.name "knqyf263"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mkdocs-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
pip install git+https://${GH_TOKEN}@github.com/squidfunk/[email protected]
pip install -r docs/build/requirements.txt
env:
GH_TOKEN: ${{ secrets.MKDOCS_AQUA_BOT }}
GH_TOKEN: ${{ secrets.MKDOCS_KHULNASOFT_BOT }}
- name: Configure the git user
run: |
git config user.name "knqyf263"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- "v*"
env:
HELM_REP: helm-charts
GH_OWNER: aquasecurity
GH_OWNER: khulnasoft
CHART_DIR: helm/tunnel
KIND_VERSION: "v0.14.0"
KIND_IMAGE: "kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae"
Expand Down Expand Up @@ -70,10 +70,10 @@ jobs:
git config --global user.name "GitHub Actions"

- name: Install tools
uses: aquaproj/aqua[email protected]
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
aqua_opts: ""
khulnasoft_version: v1.25.0
khulnasoft_opts: ""

- name: Create a PR with Tunnel version
run: mage helm:updateVersion
Expand Down Expand Up @@ -118,5 +118,5 @@ jobs:
destination_repo: "${{ env.GH_OWNER }}/${{ env.HELM_REP }}"
destination_folder: "."
destination_branch: "gh-pages"
user_email: aqua[email protected]
user_name: "aqua-bot"
user_email: khulnasoft[email protected]
user_name: "khulnasoft-bot"
2 changes: 1 addition & 1 deletion .github/workflows/reusable-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
type: string

env:
GH_USER: "aqua-bot"
GH_USER: "khulnasoft-bot"
GO_VERSION: "1.22"

jobs:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/roadmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
# 'kind/feature' AND 'priority/backlog' labels -> 'Backlog' column
- uses: actions/[email protected] # add new issue to project
with:
project-url: https://github.com/orgs/aquasecurity/projects/25
project-url: https://github.com/orgs/khulnasoft/projects/16
github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
labeled: kind/feature, priority/backlog
label-operator: AND
id: add-backlog-issue
- uses: titoportas/[email protected] # change Priority(column) of added issue
if: ${{ steps.add-backlog-issue.outputs.itemId }}
with:
project-url: https://github.com/orgs/aquasecurity/projects/25
project-url: https://github.com/orgs/khulnasoft/projects/16
github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
item-id: ${{ steps.add-backlog-issue.outputs.itemId }} # Use the item-id output of the previous step
field-keys: Priority
Expand All @@ -30,15 +30,15 @@ jobs:
# 'kind/feature' AND 'priority/important-longterm' labels -> 'Important (long-term)' column
- uses: actions/[email protected] # add new issue to project
with:
project-url: https://github.com/orgs/aquasecurity/projects/25
project-url: https://github.com/orgs/khulnasoft/projects/16
github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
labeled: kind/feature, priority/important-longterm
label-operator: AND
id: add-longterm-issue
- uses: titoportas/[email protected] # change Priority(column) of added issue
if: ${{ steps.add-longterm-issue.outputs.itemId }}
with:
project-url: https://github.com/orgs/aquasecurity/projects/25
project-url: https://github.com/orgs/khulnasoft/projects/16
github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
item-id: ${{ steps.add-longterm-issue.outputs.itemId }} # Use the item-id output of the previous step
field-keys: Priority
Expand All @@ -47,15 +47,15 @@ jobs:
# 'kind/feature' AND 'priority/important-soon' labels -> 'Important (soon)' column
- uses: actions/[email protected] # add new issue to project
with:
project-url: https://github.com/orgs/aquasecurity/projects/25
project-url: https://github.com/orgs/khulnasoft/projects/16
github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
labeled: kind/feature, priority/important-soon
label-operator: AND
id: add-soon-issue
- uses: titoportas/[email protected] # change Priority(column) of added issue
if: ${{ steps.add-soon-issue.outputs.itemId }}
with:
project-url: https://github.com/orgs/aquasecurity/projects/25
project-url: https://github.com/orgs/khulnasoft/projects/16
github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
item-id: ${{ steps.add-soon-issue.outputs.itemId }} # Use the item-id output of the previous step
field-keys: Priority
Expand All @@ -64,16 +64,16 @@ jobs:
# 'kind/feature' AND 'priority/critical-urgent' labels -> 'Urgent' column
- uses: actions/[email protected] # add new issue to project
with:
project-url: https://github.com/orgs/aquasecurity/projects/25
project-url: https://github.com/orgs/khulnasoft/projects/16
github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
labeled: kind/feature, priority/critical-urgent
label-operator: AND
id: add-urgent-issue
- uses: titoportas/[email protected] # change Priority(column) of added issue
if: ${{ steps.add-urgent-issue.outputs.itemId }}
with:
project-url: https://github.com/orgs/aquasecurity/projects/25
project-url: https://github.com/orgs/khulnasoft/projects/16
github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
item-id: ${{ steps.add-urgent-issue.outputs.itemId }} # Use the item-id output of the previous step
field-keys: Priority
field-values: Urgent
field-values: Urgent
22 changes: 11 additions & 11 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ jobs:
if: ${{ failure() && steps.lint.conclusion == 'failure' }}

- name: Install tools
uses: aquaproj/aqua[email protected]
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
aqua_opts: ""
khulnasoft_version: v1.25.0
khulnasoft_opts: ""

- name: Check if CLI references are up-to-date
run: |
Expand Down Expand Up @@ -84,9 +84,9 @@ jobs:
cache: false

- name: Install tools
uses: aquaproj/aqua[email protected]
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
khulnasoft_version: v1.25.0

- name: Generate image list digest
id: image-digest
Expand Down Expand Up @@ -120,9 +120,9 @@ jobs:
cache: false

- name: Install tools
uses: aquaproj/aqua[email protected]
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
khulnasoft_version: v1.25.0

- name: Run k8s integration tests
run: mage test:k8s
Expand All @@ -141,9 +141,9 @@ jobs:
cache: false

- name: Install tools
uses: aquaproj/aqua[email protected]
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
khulnasoft_version: v1.25.0

- name: Generate image list digest
id: image-digest
Expand Down Expand Up @@ -179,9 +179,9 @@ jobs:
cache: false

- name: Install tools
uses: aquaproj/aqua[email protected]
uses: khulnasoftproj/khulnasoft[email protected]
with:
aqua_version: v1.25.0
khulnasoft_version: v1.25.0

- name: Generate image list digest
id: image-digest
Expand Down
10 changes: 5 additions & 5 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ linters-settings:
sections:
- standard
- default
- prefix(github.com/aquasecurity/)
- prefix(github.com/khulnasoft/)
- blank
- dot
goconst:
Expand All @@ -45,14 +45,14 @@ linters-settings:
settings:
ruleguard:
failOn: all
rules: '${configDir}/misc/lint/rules.go'
rules: "${configDir}/misc/lint/rules.go"
gocyclo:
min-complexity: 20
gofmt:
simplify: false
rewrite-rules:
- pattern: 'interface{}'
replacement: 'any'
- pattern: "interface{}"
replacement: "any"
gomodguard:
blocked:
modules:
Expand Down Expand Up @@ -109,7 +109,7 @@ linters:
- usestdlibvars

run:
go: '1.22'
go: "1.22"
timeout: 30m

issues:
Expand Down
Loading
Loading