Skip to content

Commit 7d4575b

Browse files
extract smithy version from smithy-build for single source version
ISSUE: CLDSRVCLT-4
1 parent 624badf commit 7d4575b

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

.github/actions/setup-smithy/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ runs:
66
steps:
77
- name: Install Smithy CLI
88
shell: bash
9-
env:
10-
SMITHY_VERSION: '1.61.0'
119
run: |
10+
# Extract Smithy version from smithy-build.json
11+
SMITHY_VERSION=$(jq -r '.maven.dependencies[] | select(contains("smithy-aws-traits")) | split(":")[2]' smithy-build.json)
12+
echo "Installing Smithy CLI version ${SMITHY_VERSION}"
13+
1214
mkdir -p smithy-install/smithy
1315
curl -L https://github.com/smithy-lang/smithy/releases/download/${SMITHY_VERSION}/smithy-cli-linux-x86_64.zip -o smithy-install/smithy-cli-linux-x86_64.zip
1416
unzip -qo smithy-install/smithy-cli-linux-x86_64.zip -d smithy-install

src/quota.ts renamed to src/clients/bucketQuota.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
UpdateBucketQuotaCommandOutput,
88
DeleteBucketQuotaCommand,
99
DeleteBucketQuotaCommandOutput
10-
} from '../build/smithy/cloudserverBucketQuota/typescript-codegen';
11-
import { CloudserverClientConfig } from '../build/smithy/cloudserver/typescript-codegen';
10+
} from '../../build/smithy/cloudserverBucketQuota/typescript-codegen';
11+
import { CloudserverClientConfig } from '../../build/smithy/cloudserver/typescript-codegen';
1212

1313
export class BucketQuotaClient {
1414
private client: CloudserverBucketQuota;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {
22
CloudserverClient as GeneratedCloudserverClient,
33
CloudserverClientConfig
4-
} from '../build/smithy/cloudserver/typescript-codegen';
5-
import { createCustomErrorMiddleware } from './utils';
4+
} from '../../build/smithy/cloudserver/typescript-codegen';
5+
import { createCustomErrorMiddleware } from '../utils';
66

7-
export * from '../build/smithy/cloudserver/typescript-codegen';
7+
export * from '../../build/smithy/cloudserver/typescript-codegen';
88
export class CloudserverClient extends GeneratedCloudserverClient {
99
constructor(config: CloudserverClientConfig) {
1010
super(config);

src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export * from './cloudserver';
2-
export { BucketQuotaClient } from './quota';
1+
export * from './clients/cloudserver';
2+
export { BucketQuotaClient } from './clients/bucketQuota';
33
export * from './utils';

tests/testSetup.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import https from 'https';
22
import assert from 'assert';
3-
import { CloudserverClient, CloudserverClientConfig } from '../src/cloudserver';
3+
import { CloudserverClient, CloudserverClientConfig } from '../src/clients/cloudserver';
44
import { S3Client, PutObjectCommand, CreateBucketCommand, PutBucketVersioningCommand } from '@aws-sdk/client-s3';
55
import { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@aws-sdk/types';
6-
import { BucketQuotaClient } from '../src/quota';
6+
import { BucketQuotaClient } from '../src/clients/bucketQuota';
77
jest.setTimeout(30000);
88

99
const credentialsProvider: AwsCredentialIdentityProvider = async (): Promise<AwsCredentialIdentity> => ({

0 commit comments

Comments
 (0)