diff --git a/.changelog/7d52e0ac9c1740708a426c1f8a1593ff.json b/.changelog/7d52e0ac9c1740708a426c1f8a1593ff.json new file mode 100644 index 00000000000..2dd617bf956 --- /dev/null +++ b/.changelog/7d52e0ac9c1740708a426c1f8a1593ff.json @@ -0,0 +1,10 @@ +{ + "id": "7d52e0ac-9c17-4070-8a42-6c1f8a1593ff", + "type": "bugfix", + "collapse": true, + "description": "Fixup some integration tests.", + "modules": [ + "feature/s3/manager", + "service/internal/integrationtest" + ] +} \ No newline at end of file diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml new file mode 100644 index 00000000000..c7e1db31545 --- /dev/null +++ b/.github/workflows/integration-tests.yml @@ -0,0 +1,43 @@ +name: Integration Tests + +# these are expensive, limit how often they're running +# +# functionally, all we need to do is vet the code going into main +on: + pull_request: + branches: + - main + +permissions: + id-token: write + +# again, expensive, only one per PR can run and they self-cancel +concurrency: + group: ci-codebuild-${{ github.ref }} + cancel-in-progress: true + +jobs: + integration-tests: + name: Integration Tests + runs-on: ubuntu-latest + steps: + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} + aws-region: us-west-2 + - name: Run tests + id: integration-tests + uses: aws-actions/aws-codebuild-run-build@v1 + with: + project-name: aws-sdk-go-v2-integrationtests + - name: Cancel tests + if: ${{ cancelled() }} + env: + BUILD_ID: ${{ steps.integration-tests.outputs.aws-build-id }} + run: | + if [ ! -z "$BUILD_ID" ]; then + echo "aws codebuild stop-build --id $BUILD_ID" + aws codebuild stop-build --id $BUILD_ID + fi + diff --git a/Makefile b/Makefile index 01159d5fdf1..e21c88b0994 100644 --- a/Makefile +++ b/Makefile @@ -410,7 +410,7 @@ ci-lint-install: ####################### .PHONY: integration integ-modules-% cleanup-integ-buckets -integration: integ-modules-service +integration: integ-modules-service integ-modules-feature integ-modules-%: @# integration command that uses the pattern to define the root path that diff --git a/feature/s3/manager/integ_upload_test.go b/feature/s3/manager/integ_upload_test.go index 1226c547396..2b980fdc89c 100644 --- a/feature/s3/manager/integ_upload_test.go +++ b/feature/s3/manager/integ_upload_test.go @@ -497,7 +497,7 @@ func (b *invalidateHash) RegisterMiddleware(stack *middleware.Stack) error { func (b *invalidateHash) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( out middleware.SerializeOutput, metadata middleware.Metadata, err error, ) { - if input, ok := in.Parameters.(*s3.UploadPartInput); ok && input.PartNumber == aws.Int32(2) { + if input, ok := in.Parameters.(*s3.UploadPartInput); ok && aws.ToInt32(input.PartNumber) == 2 { ctx = v4.SetPayloadHash(ctx, "000") } diff --git a/service/internal/integrationtest/health/smoke_test.go b/service/internal/integrationtest/health/smoke_test.go index 3a782f71bf6..bfc26bf99ea 100644 --- a/service/internal/integrationtest/health/smoke_test.go +++ b/service/internal/integrationtest/health/smoke_test.go @@ -13,6 +13,8 @@ import ( ) func TestInteg_00_DescribeEntityAggregates(t *testing.T) { + t.Skip() // requires enterprise support, V1543069783 + ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second) defer cancelFn() diff --git a/service/internal/integrationtest/support/smoke_test.go b/service/internal/integrationtest/support/smoke_test.go index 028c85332db..b3f7152067a 100644 --- a/service/internal/integrationtest/support/smoke_test.go +++ b/service/internal/integrationtest/support/smoke_test.go @@ -17,6 +17,8 @@ import ( ) func TestInteg_00_DescribeServices(t *testing.T) { + t.Skip() // requires enterprise support, V1543069783 + ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second) defer cancelFn() @@ -34,6 +36,8 @@ func TestInteg_00_DescribeServices(t *testing.T) { } func TestInteg_01_CreateCase(t *testing.T) { + t.Skip() // requires enterprise support, V1543069783 + ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second) defer cancelFn()