Merge branch 'master' into flexible_iops_combine

powervs-ibm · Dec 11, 2023 · bc16046 · bc16046
2 parents dc73161 + d05f916
commit bc16046
Show file tree

Hide file tree

Showing 38 changed files with 234 additions and 1,113 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
 
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ^1.18
       id: go

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
         run: git fetch --prune --unshallow
       -
         name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.18
       -

diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-11-29T02:05:13Z",
+  "generated_at": "2023-12-11T01:02:37Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -560,7 +560,7 @@
         "hashed_secret": "06d988e96c3d9325c9fbc7c0ef3c6c0f2b4eb8e7",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 45,
+        "line_number": 41,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -786,47 +786,47 @@
         "hashed_secret": "9184b0c38101bf24d78b2bb0d044deb1d33696fc",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 132,
+        "line_number": 131,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "c427f185ddcb2440be9b77c8e45f1cd487a2e790",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1449,
+        "line_number": 1438,
         "type": "Base64 High Entropy String",
         "verified_result": null
       },
       {
         "hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1516,
+        "line_number": 1505,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "1f614c2eb6b3da22d89bd1b9fd47d7cb7c8fc670",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 3325,
+        "line_number": 3298,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "7abfce65b8504403afc25c9790f358d513dfbcc6",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 3338,
+        "line_number": 3311,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "0c2d85bf9a9b1579b16f220a4ea8c3d62b2e24b1",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 3379,
+        "line_number": 3352,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2876,15 +2876,15 @@
         "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 334,
+        "line_number": 335,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 654,
+        "line_number": 663,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2904,15 +2904,15 @@
         "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 119,
+        "line_number": 120,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 293,
+        "line_number": 298,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2932,15 +2932,15 @@
         "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 236,
+        "line_number": 237,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 884,
+        "line_number": 875,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2960,15 +2960,15 @@
         "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 72,
+        "line_number": 73,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 504,
+        "line_number": 499,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -4505,16 +4505,6 @@
         "verified_result": null
       }
     ],
-    "website/docs/r/logs_router_tenant.html.markdown": [
-      {
-        "hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 78,
-        "type": "Secret Keyword",
-        "verified_result": null
-      }
-    ],
     "website/docs/r/metrics_router_route.html.markdown": [
       {
         "hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",

diff --git a/examples/ibm-logs-router/README.md b/examples/ibm-logs-router/README.md
diff --git a/examples/ibm-logs-router/main.tf b/examples/ibm-logs-router/main.tf
diff --git a/examples/ibm-logs-router/outputs.tf b/examples/ibm-logs-router/outputs.tf
diff --git a/examples/ibm-logs-router/variables.tf b/examples/ibm-logs-router/variables.tf
diff --git a/examples/ibm-logs-router/versions.tf b/examples/ibm-logs-router/versions.tf
diff --git a/examples/ibm-project/README.md b/examples/ibm-project/README.md
@@ -69,8 +69,8 @@ data "project" "project_instance" {
 project_environment data source:
 
 ```hcl
-data "ibm_project_environment" "project_environment_instance" {
-  project_id = ibm_project_environment.project_environment_instance.project_id
+data "project_environment" "project_environment_instance" {
+  project_id = ibm_project.project_instance.id
   project_environment_id = ibm_project_environment.project_environment_instance.project_environment_id
 }
 ```

diff --git a/examples/ibm-project/main.tf b/examples/ibm-project/main.tf
@@ -13,13 +13,9 @@ resource "ibm_project_config" "project_config_instance" {
       api_key = "<your_apikey_here>"
     }
     locator_id = "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.145be7c1-9ec4-4719-b586-584ee52fbed0-global"
-    input {
+    inputs = {
       name = "app_repo_name"
     }
-    setting {
-      name = "app_repo_name"
-      value = "static-website-dev-app-repo"
-    }
   }
 }
 
@@ -61,5 +57,5 @@ data "ibm_project" "project_instance" {
 // Create project_environment data source
 data "ibm_project_environment" "project_environment_instance" {
   project_id = ibm_project.project_instance.id
-  project_environment_id = var.project_environment_project_environment_id
+  project_environment_id = ibm_project_environment.project_environment_instance.project_environment_id
 }
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/IBM-Cloud/terraform-provider-ibm
 go 1.18
 
 require (
-	github.com/IBM-Cloud/bluemix-go v0.0.0-20231123082353-50e8cc9c6959
+	github.com/IBM-Cloud/bluemix-go v0.0.0-20231204080125-462fa9e436bc
 	github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20231106114255-c50117860a3c
 	github.com/IBM-Cloud/power-go-client v1.5.4
 	github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca
@@ -23,10 +23,9 @@ require (
 	github.com/IBM/ibm-hpcs-tke-sdk v0.0.0-20211109141421-a4b61b05f7d1
 	github.com/IBM/ibm-hpcs-uko-sdk v0.0.20-beta
 	github.com/IBM/keyprotect-go-client v0.12.2
-	github.com/IBM/logs-router-go-sdk v1.0.0
 	github.com/IBM/networking-go-sdk v0.42.2
 	github.com/IBM/platform-services-go-sdk v0.54.0
-	github.com/IBM/project-go-sdk v0.1.1
+	github.com/IBM/project-go-sdk v0.1.4
 	github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
 	github.com/IBM/scc-go-sdk/v5 v5.1.3
 	github.com/IBM/schematics-go-sdk v0.2.2