Merge branch 'master' into share-ga

IBM-Cloud · Aug 30, 2023 · ad7daa2 · ad7daa2
2 parents ce11e3d + 5bc91f6
commit ad7daa2
Show file tree

Hide file tree

Showing 116 changed files with 10,156 additions and 1,090 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -20,7 +20,7 @@ jobs:
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3.5.3
+      uses: actions/checkout@v3.6.0
 
     - name: Get dependencies
       run: |

diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
@@ -6,7 +6,7 @@ jobs:
   labelIssues:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.5.3
+    - uses: actions/checkout@v3.6.0
     - name: Apply Issue Labels
       uses: github/[email protected]
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.6.0
       -
         name: Unshallow
         run: git fetch --prune --unshallow

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-08-11T12:56:26Z",
+  "generated_at": "2023-08-29T14:07:58Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -722,23 +722,23 @@
         "hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 335,
+        "line_number": 355,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 341,
+        "line_number": 361,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1035,
+        "line_number": 1067,
         "type": "Base64 High Entropy String",
         "verified_result": null
       }
@@ -1073,6 +1073,34 @@
         "verified_result": null
       }
     ],
+    "ibm/service/catalogmanagement/data_source_ibm_cm_catalog.go": [
+      {
+        "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 391,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "ibm/service/catalogmanagement/resource_ibm_cm_catalog.go": [
+      {
+        "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 369,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
+      {
+        "hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 994,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
     "ibm/service/catalogmanagement/resource_ibm_cm_version_test.go": [
       {
         "hashed_secret": "c538565cf19589d92225a6c33dc5ed529b3213c2",
@@ -1210,7 +1238,7 @@
         "hashed_secret": "505032eaf8a3acf9b094a326dfb1cd0537c75a0d",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 230,
+        "line_number": 235,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -1306,7 +1334,7 @@
         "hashed_secret": "505032eaf8a3acf9b094a326dfb1cd0537c75a0d",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 335,
+        "line_number": 340,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2022,31 +2050,31 @@
         "hashed_secret": "deab23f996709b4e3d14e5499d1cc2de677bfaa8",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1574,
+        "line_number": 1551,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "20a25bac21219ffff1904bde871ded4027eca2f8",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 2237,
+        "line_number": 2204,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 2256,
+        "line_number": 2223,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 2524,
+        "line_number": 2488,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2056,7 +2084,7 @@
         "hashed_secret": "10c28f9cf0668595d45c1090a7b4a2ae98edfa58",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 737,
+        "line_number": 726,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2076,7 +2104,7 @@
         "hashed_secret": "10c28f9cf0668595d45c1090a7b4a2ae98edfa58",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 779,
+        "line_number": 778,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2086,7 +2114,7 @@
         "hashed_secret": "10c28f9cf0668595d45c1090a7b4a2ae98edfa58",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 202,
+        "line_number": 199,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2134,15 +2162,15 @@
         "hashed_secret": "e407cbe1c64cadb886be6f42907e2dd1c06ca080",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 677,
+        "line_number": 626,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "10c28f9cf0668595d45c1090a7b4a2ae98edfa58",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1098,
+        "line_number": 991,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2537,16 +2565,6 @@
         "verified_result": null
       }
     ],
-    "ibm/service/iamidentity/data_source_ibm_iam_account_settings_template_assignment_test.go": [
-      {
-        "hashed_secret": "707de7a6ce7c750e8ea7e585493cd49f327ffb9f",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 59,
-        "type": "Hex High Entropy String",
-        "verified_result": null
-      }
-    ],
     "ibm/service/iamidentity/data_source_ibm_iam_account_settings_template_test.go": [
       {
         "hashed_secret": "cf4d2385b84329a52ca542285b93d9c4618420df",
@@ -2567,16 +2585,6 @@
         "verified_result": null
       }
     ],
-    "ibm/service/iamidentity/data_source_ibm_iam_trusted_profile_template_assignment_test.go": [
-      {
-        "hashed_secret": "707de7a6ce7c750e8ea7e585493cd49f327ffb9f",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 63,
-        "type": "Hex High Entropy String",
-        "verified_result": null
-      }
-    ],
     "ibm/service/iamidentity/resource_ibm_iam_account_settings.go": [
       {
         "hashed_secret": "b939bb67ee5f5b13f7997dba58c31813ce8033f0",
@@ -2600,21 +2608,11 @@
         "hashed_secret": "0df33518acd3791ccae4a46c87c2e3bb86bba567",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 586,
+        "line_number": 589,
         "type": "Secret Keyword",
         "verified_result": null
       }
     ],
-    "ibm/service/iamidentity/resource_ibm_iam_account_settings_template_assignment_test.go": [
-      {
-        "hashed_secret": "707de7a6ce7c750e8ea7e585493cd49f327ffb9f",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 91,
-        "type": "Hex High Entropy String",
-        "verified_result": null
-      }
-    ],
     "ibm/service/iamidentity/resource_ibm_iam_account_settings_template_test.go": [
       {
         "hashed_secret": "cf4d2385b84329a52ca542285b93d9c4618420df",
@@ -2681,16 +2679,6 @@
         "verified_result": null
       }
     ],
-    "ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go": [
-      {
-        "hashed_secret": "707de7a6ce7c750e8ea7e585493cd49f327ffb9f",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 88,
-        "type": "Hex High Entropy String",
-        "verified_result": null
-      }
-    ],
     "ibm/service/kms/resource_ibm_kms_key_policies.go": [
       {
         "hashed_secret": "0b60828897517e2b8013af62b288e055bf0d095d",
@@ -3580,23 +3568,23 @@
         "hashed_secret": "f855f5027fd8fdb2df3f6a6f1cf858fffcbedb0c",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 86677,
+        "line_number": 86802,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "5fb0fa884132a8724a8d7cba55853737e442adbd",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 107991,
+        "line_number": 108081,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "1e5c2f367f02e47a8c160cda1cd9d91decbac441",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 136578,
+        "line_number": 136739,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -4268,15 +4256,15 @@
         "hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 107,
+        "line_number": 109,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 109,
+        "line_number": 111,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -4854,15 +4842,15 @@
         "hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 146,
+        "line_number": 148,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 148,
+        "line_number": 150,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -5080,7 +5068,7 @@
       }
     ]
   },
-  "version": "0.13.1+ibm.61.dss",
+  "version": "0.13.1+ibm.47.dss",
   "word_list": {
     "file": null,
     "hash": null