From aa6fd3b88d0957ca655a93604658e61f6a8f6830 Mon Sep 17 00:00:00 2001 From: Heng Lu Date: Tue, 4 Mar 2025 09:51:22 +0800 Subject: [PATCH 1/2] bugfix: azapi examples are not correctly loaded --- CHANGELOG.md | 4 ++++ dependency/azapi.go | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83b1916..644625c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v0.16.1 +BUG FIXES: +- Fix a bug the azapi examples are not correctly loaded. + ## v0.16.0 ENHANCEMENTS: diff --git a/dependency/azapi.go b/dependency/azapi.go index 3ee20aa..3a681e7 100644 --- a/dependency/azapi.go +++ b/dependency/azapi.go @@ -42,10 +42,16 @@ func LoadAzapiDependencies() ([]Dependency, error) { return nil, err } for _, entry := range entries { + if !entry.IsDir() { + continue + } filename := path.Join(dir, entry.Name(), "main.tf") if _, err := StaticFiles.Open(filename); os.IsNotExist(err) { filename = path.Join(dir, entry.Name(), "basic", "main.tf") } + if _, err := StaticFiles.Open(filename); os.IsNotExist(err) { + continue + } data, err := StaticFiles.ReadFile(filename) if err != nil { return nil, err From 55946bf3475094d8bb5c29518af64231b02c0300 Mon Sep 17 00:00:00 2001 From: Heng Lu Date: Tue, 4 Mar 2025 10:05:56 +0800 Subject: [PATCH 2/2] fix unit test --- .github/workflows/unit-test.yaml | 5 +++++ coverage/coverage_test.go | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index 3d5f650..8e91958 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -18,6 +18,11 @@ jobs: - uses: actions/setup-go@v2 with: go-version: '1.20.5' + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: latest + terraform_wrapper: false - run: chmod -R +x ./scripts - run: bash scripts/gogetcookie.sh - run: make test diff --git a/coverage/coverage_test.go b/coverage/coverage_test.go index 569b65c..d0b969b 100644 --- a/coverage/coverage_test.go +++ b/coverage/coverage_test.go @@ -1264,7 +1264,7 @@ func TestCoverage_DataFactoryPipelines(t *testing.T) { resourceType: "Microsoft.DataFactory/factories/pipelines@2018-06-01", method: "PUT", expectedCoveredCount: 13, - expectedTotalCount: 7243, + expectedTotalCount: 7253, apiPath: "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/pipelines/examplePipeline", rawRequest: []string{ `{ @@ -1362,7 +1362,7 @@ func TestCoverage_DataFactoryLinkedServices(t *testing.T) { resourceType: "Microsoft.DataFactory/factories/linkedServices@2018-06-01", method: "PUT", expectedCoveredCount: 3, - expectedTotalCount: 3470, + expectedTotalCount: 3540, apiPath: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/rg1/providers/Microsoft.DataFactory/factories/factory1/linkedServices/linked", rawRequest: []string{ `{