Skip to content
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
21 changes: 18 additions & 3 deletions .github/workflows/testPython.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
pull_request:
branches: [ master ]

permissions:
id-token: write

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -21,16 +24,28 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: pip install alibabacloud-tea coverage pytest
- name: Setup OIDC
run: npm install @actions/core@1.6.0 @actions/http-client
- name: Get Id Token
uses: actions/github-script@v6
id: idtoken
with:
script: |
const coreDemo = require('@actions/core');
const idToken = await coreDemo.getIDToken('sts.aliyuncs.com');
const fsx = require('fs/promises');
await fsx.writeFile('/tmp/oidc_token', idToken);
- name: Test with unittest
run: |
coverage run -m unittest discover
env:
SUB_ALIBABA_CLOUD_ACCESS_KEY: ${{ secrets.SUB_ALIBABA_CLOUD_ACCESS_KEY }}
SUB_ALIBABA_CLOUD_SECRET_KEY: ${{ secrets.SUB_ALIBABA_CLOUD_SECRET_KEY }}
ALIBABA_CLOUD_ROLE_ARN: ${{ secrets.ALIBABA_CLOUD_ROLE_ARN }}
SUB_ALIBABA_CLOUD_ROLE_ARN: ${{ secrets.ALIBABA_CLOUD_ROLE_ARN }}
ALIBABA_CLOUD_ROLE_ARN: ${{ secrets.OIDC_ROLE_ARN }}
ALIBABA_CLOUD_ROLE_SESSION_NAME: ${{ secrets.ALIBABA_CLOUD_ROLE_SESSION_NAME }}
ALIBABA_CLOUD_OIDC_TOKEN_FILE: ${{ secrets.ALIBABA_CLOUD_OIDC_TOKEN_FILE }}
ALIBABA_CLOUD_OIDC_PROVIDER_ARN: ${{ secrets.ALIBABA_CLOUD_OIDC_PROVIDER_ARN }}
ALIBABA_CLOUD_OIDC_TOKEN_FILE: "/tmp/oidc_token"
ALIBABA_CLOUD_OIDC_PROVIDER_ARN: ${{ secrets.OIDC_PROVIDER_ARN }}
- name: Upload Coverage Report
uses: codecov/codecov-action@v4
with:
Expand Down
31 changes: 24 additions & 7 deletions tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

from alibabacloud_credentials import providers, models
from alibabacloud_credentials.client import Client
from alibabacloud_credentials.exceptions import CredentialException
from alibabacloud_credentials.utils import auth_util


Expand All @@ -12,7 +11,7 @@ def test_RamRoleArn(self):
access_key_id = os.environ.get('SUB_ALIBABA_CLOUD_ACCESS_KEY')
access_key_secret = os.environ.get('SUB_ALIBABA_CLOUD_SECRET_KEY')
role_session_name = os.environ.get('ALIBABA_CLOUD_ROLE_SESSION_NAME')
role_arn = os.environ.get('ALIBABA_CLOUD_ROLE_ARN')
role_arn = os.environ.get('SUB_ALIBABA_CLOUD_ROLE_ARN')

conf = models.Config(
access_key_id=access_key_id,
Expand All @@ -30,8 +29,26 @@ def test_OIDCRoleArn(self):
self.assertIsNotNone(auth_util.environment_role_session_name)
self.assertIsNotNone(auth_util.environment_oidc_token_file)
self.assertTrue(auth_util.enable_oidc_credential)
try:
default_client = Client()
default_client.get_access_key_id()
except CredentialException as e:
self.assertRegex(e.message, 'AuthenticationFail.NoPermission')
default_client = Client()
credential = default_client.get_credential()
self.assertIsNotNone(credential.access_key_id)
self.assertIsNotNone(credential.access_key_secret)
self.assertIsNotNone(credential.security_token)

role_session_name = os.environ.get('ALIBABA_CLOUD_ROLE_SESSION_NAME')
oidc_role_arn = os.environ.get('ALIBABA_CLOUD_ROLE_ARN')
oidc_provider_arn = os.environ.get('ALIBABA_CLOUD_OIDC_PROVIDER_ARN')
oidc_token_file = os.environ.get('ALIBABA_CLOUD_OIDC_TOKEN_FILE')
config = models.Config(
role_session_name=role_session_name,
role_arn=oidc_role_arn,
oidc_provider_arn=oidc_provider_arn,
oidc_token_file_path=oidc_token_file,
type='oidc_role_arn',
)
client = Client(config)
credential = client.get_credential()
self.assertIsNotNone(credential.access_key_id)
self.assertIsNotNone(credential.access_key_secret)
self.assertIsNotNone(credential.security_token)
self.assertEqual('oidc_role_arn', credential.type)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

默认凭证链也可以测一个