consume latest go-sdk

HewlettPackard · Jul 10, 2024 · 6b18908 · 6b18908
1 parent e463160
commit 6b18908
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 26 deletions.
diff --git a/.github/workflows/cicd-dev-acc.yml b/.github/workflows/cicd-dev-acc.yml
@@ -10,7 +10,6 @@ jobs:
     with:
       test_case: TestProvider
       test_description: Check for valid terraform provider
-      test_case_folder: acc-external-testcases
     secrets: inherit
 
   test-datasouces:
@@ -20,7 +19,6 @@ jobs:
     with:
       test_case: TestAccDataSource
       test_description: GET call usecase validations
-      test_case_folder: acc-external-testcases
     secrets: inherit
 
   test-vmaas-instance:
@@ -30,30 +28,29 @@ jobs:
     with:
       test_case: TestVmaasInstance TestAccResourceInstance
       test_description: Instance usecase validations
-      test_case_folder: acc-external-testcases
     secrets: inherit
 
-  # test-vmaas-lb:
-  #   uses: ./.github/workflows/reusable-dev-acc.yml
-  #   needs: [test-vmaas-instance]
-  #   if: "always()"
-  #   with:
-  #     test_case: TestVmaasLB TestAccResourceLB TestVmaasLoadBalancerPlan TestAccResourceLoadBalancerCreate
-  #     test_description: Loadbalancer usecase validations
-  #   secrets: inherit
+  test-vmaas-lb:
+    uses: ./.github/workflows/reusable-dev-acc.yml
+    needs: [test-vmaas-instance]
+    if: "always()"
+    with:
+      test_case: TestVmaasLB TestAccResourceLB TestVmaasLoadBalancerPlan TestAccResourceLoadBalancerCreate
+      test_description: Loadbalancer usecase validations
+    secrets: inherit
 
-  # test-vmaas-network:
-  #   uses: ./.github/workflows/reusable-dev-acc.yml
-  #   needs: [test-vmaas-lb]
-  #   if: "always()"
-  #   with:
-  #     test_case: TestVmaasNetworkPlan TestAccResourceNetworkCreate TestAccResourceRouter TestVmaasRouter TestAccResourceTier TestVmaasRouteBGPNeighborPlan
-  #     test_description: NSX Network usecase validations
-  #   secrets: inherit
+  test-vmaas-network:
+    uses: ./.github/workflows/reusable-dev-acc.yml
+    needs: [test-vmaas-lb]
+    if: "always()"
+    with:
+      test_case: TestVmaasNetworkPlan TestAccResourceNetworkCreate TestAccResourceRouter TestVmaasRouter TestAccResourceTier TestVmaasRouteBGPNeighborPlan
+      test_description: NSX Network usecase validations
+    secrets: inherit
 
   process-logs:
     runs-on: ubuntu-20.04
-    needs: [test-vmaas-instance]
+    needs: [test-vmaas-network]
     if: "always()"
     steps:
       - name: Checkout workspace

diff --git a/.github/workflows/reusable-dev-acc.yml b/.github/workflows/reusable-dev-acc.yml
@@ -42,7 +42,7 @@ env:
   HPEGL_USER_SECRET: ${{ secrets.DEV_HPEGL_USER_SECRET }}
   HPEGL_USER_ID: ${{ secrets.DEV_HPEGL_USER_ID }}
   HPEGL_VMAAS_API_URL: ${{ secrets.DEV_HPEGL_VMAAS_API_URL }}
-  HPEGL_VMAAS_LOCATION: FTC-External-Cloud
+  HPEGL_VMAAS_LOCATION: ${{ secrets.DEV_HPEGL_VMAAS_LOCATION }}
   HPEGL_VMAAS_SPACE_NAME: ${{ secrets.DEV_HPEGL_VMAAS_SPACE_NAME}}
   TF_ACC: ${{ secrets.TF_ACC }}
   LOG_FILE: "Terraform Log - ${{ inputs.test_description }}.txt"

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/HewlettPackard/hpegl-vmaas-terraform-resources
 go 1.21
 
 require (
-	github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.10-0.20240709064659-e6d2be1f7685
+	github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.10
 	github.com/golang/mock v1.6.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-docs v0.9.0

diff --git a/go.sum b/go.sum
@@ -1,9 +1,7 @@
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.9 h1:SjJgSnyD1XXAHy6kExOYTFiwAaAmBwvj/0BA+e+AyeA=
-github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.9/go.mod h1:UzXizYR6sUVsvDRMcLC2E4eabJsPH/3nM8rlKL2BLSc=
-github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.10-0.20240709064659-e6d2be1f7685 h1:hHzOZSjxmfPh5h0716aVtgHWnkhljm+aGVeN49+KQbA=
-github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.10-0.20240709064659-e6d2be1f7685/go.mod h1:UzXizYR6sUVsvDRMcLC2E4eabJsPH/3nM8rlKL2BLSc=
+github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.10 h1:RLRtdCjl12eunpAxSNrlUJTGFALbDR0lmZuW/ICbiOQ=
+github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.10/go.mod h1:UzXizYR6sUVsvDRMcLC2E4eabJsPH/3nM8rlKL2BLSc=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=