Skip to content

Commit 77e23d4

Browse files
Revert irrelevant changes
1 parent 219fef7 commit 77e23d4

File tree

7 files changed

+1100
-10
lines changed

7 files changed

+1100
-10
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,18 @@ jobs:
103103
cache-dependency-path: |
104104
**/go.sum
105105
# disable caching on windows because it's very slow
106+
# see https://github.com/actions/setup-go/issues/495
106107
cache: ${{ matrix.platform != 'windows-latest' }}
107108
- name: export feature flags
108109
run: echo ${{ matrix.feature-flags }}=true >> $GITHUB_ENV
109110
if: ${{ matrix.platform != 'windows-latest' && matrix.feature-flags != 'DEFAULT' }}
110-
- name: export feature flags
111-
run: echo ${{ matrix.feature-flags }}=true >> $env:GITHUB_ENV
112-
if: ${{ matrix.platform == 'windows-latest' && matrix.feature-flags != 'DEFAULT' }}
113111
- name: Build
114112
run: make build
115113
- name: Build PF
116114
run: cd pkg/pf && make build
117115
- name: Shard tests
118116
run: echo "SHARD_CMD=$(go run github.com/VenelinMartinov/sharder@9d09afeb1c053b4a0263fbaa5c3c9da1ca2d10e7 --total ${{ env.TOTAL_SHARDS }} --index ${{ matrix.shard }} --output testoutput.txt --format make)" >> $GITHUB_ENV
119117
if: ${{ matrix.platform == 'ubuntu-latest' }}
120-
- run: echo "$SHARD_CMD"
121-
if: ${{ matrix.platform == 'ubuntu-latest' }}
122118
- name: Test
123119
run: make VERBOSE=true test_shard
124120
if: ${{ matrix.platform == 'ubuntu-latest' }}

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,4 @@ testing/coverage.txt
1414
pf/coverage.out
1515
pf/tests/coverage.out
1616

17-
pulumi-hcl-lint
18-
19-
schema-tpsdkv2.json
17+
pulumi-hcl-lint

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ test:: install_plugins
3333
PULUMI_TERRAFORM_BRIDGE_TEST_PROVIDER=$(shell pwd)/bin/pulumi-terraform-bridge-test-provider \
3434
go test -count=1 -coverprofile="coverage.txt" -coverpkg=./... -timeout 2h -parallel ${TESTPARALLELISM} ./...
3535

36+
# Run a single shard of tests. This is a make target for use in CI. It assumes the shard arguments are provided in SHARD_CMD
3637
test_shard:: install_plugins
3738
@mkdir -p bin
3839
go build -o bin ./internal/testing/pulumi-terraform-bridge-test-provider
3940
PULUMI_TERRAFORM_BRIDGE_TEST_PROVIDER=$(shell pwd)/bin/pulumi-terraform-bridge-test-provider \
4041
go test -count=1 -coverprofile="coverage.txt" -coverpkg=./... -timeout 2h -parallel ${TESTPARALLELISM} ./... ${SHARD_CMD}
4142

43+
# Run the tests and record profiling data. This is used for partitioning tests into shards for CI.
4244
test_profile:: install_plugins
4345
@mkdir -p bin
4446
go build -o bin ./internal/testing/pulumi-terraform-bridge-test-provider

pkg/pf/tests/provider_configure_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ func TestConfigureBooleans(t *testing.T) {
534534
}`)
535535
}
536536

537-
func TestConfigureErrorReplacementPF(t *testing.T) {
537+
func TestConfigureErrorReplacement(t *testing.T) {
538538
t.Parallel()
539539
t.Run("replace_config_properties", func(t *testing.T) {
540540
errString := `some error with "config_property" and "config" but not config`

pkg/tfbridge/provider_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1988,7 +1988,7 @@ func TestConfigure(t *testing.T) {
19881988
})
19891989
}
19901990

1991-
func TestConfigureErrorReplacementSDKv2(t *testing.T) {
1991+
func TestConfigureErrorReplacement(t *testing.T) {
19921992
t.Parallel()
19931993
t.Run("replace_config_properties", func(t *testing.T) {
19941994
p := testprovider.ProviderV2()

0 commit comments

Comments
 (0)