Skip to content

KCLpy AWS credentials role change and dependabot auto-merge fix #283

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

Merged
merged 37 commits into from
May 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fc56bae
add dependabot auto-merge and workflow dispatch; update documentation
skyero-aws Apr 25, 2025
bb734a8
edited names of jobs and steps
skyero-aws Apr 26, 2025
58c6a9e
add jdk version to matrix
skyero-aws Apr 28, 2025
e6a2cf8
update jdk versions to 8, 11, 17, 21, 24
skyero-aws Apr 28, 2025
197e352
change auto merge conditions to just not major versions
skyero-aws Apr 28, 2025
de253ea
update workflow name
skyero-aws May 1, 2025
a0f56e2
remove on.push
skyero-aws May 2, 2025
2eb3944
update permissions for dependabot automerge
skyero-aws May 2, 2025
38dc411
add maven to dependabot.yml and increase pr limit to 2
skyero-aws May 2, 2025
f2f28f1
Bump com.google.errorprone:error_prone_annotations from 2.7.1 to 2.38.0
dependabot[bot] May 2, 2025
abf8a72
Bump netty.version from 4.1.118.Final to 4.2.0.Final
dependabot[bot] May 2, 2025
1b71333
Merge pull request #9 from skyero-aws/dependabot/maven/netty.version-…
github-actions[bot] May 2, 2025
fa9e842
Bump awssdk.version from 2.25.64 to 2.31.35
dependabot[bot] May 5, 2025
a4acd83
Merge pull request #10 from skyero-aws/dependabot/maven/awssdk.versio…
github-actions[bot] May 5, 2025
75ae41c
Merge pull request #8 from skyero-aws/dependabot/maven/com.google.err…
github-actions[bot] May 5, 2025
5a1203a
revert auto-merge of dependencies
skyero-aws May 5, 2025
b7bbe3a
change arn role name
skyero-aws May 12, 2025
d5d1932
trim down tests
skyero-aws May 12, 2025
6dbcf92
revert dependabot.yml
skyero-aws May 12, 2025
e05435e
add additional permissions and add approval step in auto-merge
skyero-aws May 14, 2025
2a83af0
readd maven as package ecosystem
skyero-aws May 14, 2025
1084f22
Bump netty.version from 4.1.118.Final to 4.2.1.Final
dependabot[bot] May 14, 2025
65118d8
Merge pull request #14 from skyero-aws/dependabot/maven/netty.version…
github-actions[bot] May 14, 2025
2059c39
revert pom
skyero-aws May 14, 2025
1a8d1f5
Bump fasterxml-jackson.version from 2.13.5 to 2.19.0
dependabot[bot] May 14, 2025
2771836
Merge pull request #15 from skyero-aws/dependabot/maven/fasterxml-jac…
github-actions[bot] May 14, 2025
1884635
Bump commons-io:commons-io from 2.16.1 to 2.19.0
dependabot[bot] May 15, 2025
bf7598f
Merge pull request #16 from skyero-aws/dependabot/maven/commons-io-co…
github-actions[bot] May 15, 2025
dd455c8
change dependency download link
skyero-aws May 16, 2025
2a45b64
increase pr limit to 4
skyero-aws May 16, 2025
36de681
sync pom with main repo
skyero-aws May 16, 2025
e62c838
Merge branch 'master' into master
skyero-aws May 16, 2025
16269d6
change jar download website path
skyero-aws May 16, 2025
08dfdf6
add on.push.master
skyero-aws May 16, 2025
4fc01a2
add export kclmvnrepo path
skyero-aws May 16, 2025
8d3d8c0
change env method for jar files
skyero-aws May 20, 2025
3ae7a1a
disable automerge
skyero-aws May 21, 2025
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
5 changes: 2 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
open-pull-requests-limit: 2
schedule:
interval: "daily"
interval: "weekly"

- package-ecosystem: "maven"
directory: "/"
open-pull-requests-limit: 2
open-pull-requests-limit: 4
schedule:
interval: "daily"
28 changes: 22 additions & 6 deletions .github/workflows/privileged-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@

name: Sample Run and Dependabot Auto-merge
on:
push:
branches: [ master ]
pull_request_target:
branches: [ master ]
workflow_dispatch:

permissions:
id-token: write
contents: write
pull-requests: write
statuses: write

jobs:
sample-run:
Expand All @@ -24,20 +28,22 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.9", "3.10", "3.11" ]
python-version: [ "3.9", "3.10", "3.11" ]
jdk-version: [ "8", "11", "17", "21", "24" ]
os: [ ubuntu-latest, macOS-latest, windows-latest ]

steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-region: us-east-1
role-to-assume: arn:aws:iam::751999266872:role/GitHubWorkflows
role-session-name: myGitHubActions
role-to-assume: arn:aws:iam::751999266872:role/GitHubPython
role-session-name: myGitHubActionsPython

- name: Set up JDK ${{ matrix.jdk-version }}
uses: actions/setup-java@v4
Expand Down Expand Up @@ -66,6 +72,8 @@ jobs:
python -m build
python setup.py download_jars
python setup.py install
env:
KCL_MVN_REPO_SEARCH_URL: https://repo1.maven.org/maven2/

- name: Put words to sample stream
run: |
Expand All @@ -85,17 +93,25 @@ jobs:
auto-merge-dependabot:
needs: [sample-run]
runs-on: ubuntu-latest
if: github.event.pull_request.user.login == 'dependabot[bot]'
if: github.actor == 'dependabot[bot]' && github.event.pull_request.user.login == 'dependabot[bot]'
steps:
- name: Fetch Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2
with:
alert-lookup: true
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs

- name: Approve PR
if: steps.metadata.outputs.update-type != 'version-update:semver-major'
run: gh pr merge --auto --merge "$PR_URL"
run: gh pr review --approve "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

# - name: Enable auto-merge for Dependabot PRs
# if: steps.metadata.outputs.update-type != 'version-update:semver-major'
# run: gh pr merge --auto --merge "$PR_URL"
# env:
# PR_URL: ${{github.event.pull_request.html_url}}
# GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,9 @@ def package_url(self, group_id, artifact_id, version):
#
# Sample url:
# https://search.maven.org/remotecontent?filepath=org/apache/httpcomponents/httpclient/4.2/httpclient-4.2.jar
# https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2/httpclient-4.2.jar
#
prefix = os.getenv("KCL_MVN_REPO_SEARCH_URL", 'https://search.maven.org/remotecontent?filepath=')
prefix = os.getenv("KCL_MVN_REPO_SEARCH_URL", 'https://repo1.maven.org/maven2/')
return '{prefix}{path}/{artifact_id}/{version}/{dest}'.format(
prefix=prefix,
path='/'.join(group_id.split('.')),
Expand Down
Loading