Skip to content

Update aws cli path #8

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

Closed
wants to merge 11 commits into from
Closed
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
8 changes: 4 additions & 4 deletions .github/workflows/awscli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
- name: List us-east-1 DHCP option set values w/ default json output
uses: ./packages/awscli
with:
cli-command: ec2
cli-subcommand: describe-dhcp-options
cli-parameters: --query DhcpOptions[0].DhcpConfigurations[*].Values[0].Value
aws-region: us-east-1
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
- name: Get network interface subnet ID
id: net-int-subnet-id
uses: ./packages/awscli
Expand All @@ -48,7 +48,7 @@ jobs:
cli-subcommand: describe-network-interfaces
cli-options: --output text
cli-parameters: --query NetworkInterfaces[0].SubnetId
aws-region: us-east-1
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
- name: Describe interface subnet ID
uses: ./packages/awscli
env:
Expand All @@ -57,4 +57,4 @@ jobs:
cli-command: ec2
cli-subcommand: describe-subnets
cli-parameters: --subnet-id ${{ steps.net-int-subnet-id.outputs.cli-output }} --query Subnets[*].Tags
aws-region: us-east-1
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
2 changes: 1 addition & 1 deletion .github/workflows/iam_access_credentials.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
2 changes: 1 addition & 1 deletion .github/workflows/s3_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
- name: Sync to S3
uses: ./packages/s3_sync
with:
Expand Down
2 changes: 1 addition & 1 deletion packages/awscli-core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class AwsCli {
case 'linux': {
const AwsCliPath = await tc.downloadTool('https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip');
const AwsCliExtractedDir = await tc.extractZip(AwsCliPath);
core.addPath(AwsCliExtractedDir);
core.addPath(AwsCliExtractedDir + '/aws/dist);
break;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/awscli-core/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ var AwsCli = /** @class */ (function () {
return [4 /*yield*/, tc.extractZip(AwsCliPath)];
case 3:
AwsCliExtractedDir = _b.sent();
core.addPath(AwsCliExtractedDir);
core.addPath(AwsCliExtractedDir + '/aws/dist');
return [3 /*break*/, 8];
case 4: return [4 /*yield*/, tc.downloadTool('https://awscli.amazonaws.com/AWSCLIV2.msi')];
case 5:
Expand Down
2 changes: 1 addition & 1 deletion packages/s3_sync/dist/index.js

Large diffs are not rendered by default.