Merge remote-tracking branch 'upstream/master' into cdb-password-comp…

…lexity
IBM-Cloud · Nov 17, 2023 · 6ac093a · 6ac093a
2 parents 18571fe + e69b93c
commit 6ac093a
Show file tree

Hide file tree

Showing 85 changed files with 3,681 additions and 535 deletions.
diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
     - uses: actions/[email protected]
     - name: Apply Issue Labels
-      uses: github/issue-labeler@v3.2
+      uses: github/issue-labeler@v3.3
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: .github/labeler-issue.yml

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-16T20:26:13Z",
+  "generated_at": "2023-11-17T11:54:15Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -428,7 +428,15 @@
         "hashed_secret": "dc61ac50e6f36d09340d8ca062da1f0d4215004f",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 61,
+        "line_number": 62,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
+      {
+        "hashed_secret": "f4adb76dda1dc36da0e225b8477887a30e7346c9",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 131,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -752,23 +760,23 @@
         "hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 401,
+        "line_number": 416,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 407,
+        "line_number": 422,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1118,
+        "line_number": 1127,
         "type": "Base64 High Entropy String",
         "verified_result": null
       }
@@ -838,15 +846,15 @@
         "hashed_secret": "da8cae6284528565678de15e03d461e23fe22538",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1845,
+        "line_number": 1858,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "1a0334cfa65f4be58b9d914b8e96e9d9478bfbac",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 3226,
+        "line_number": 3239,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -856,15 +864,15 @@
         "hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1800,
+        "line_number": 1803,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1806,
+        "line_number": 1809,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -1260,15 +1268,7 @@
         "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 129,
-        "type": "Secret Keyword",
-        "verified_result": null
-      },
-      {
-        "hashed_secret": "505032eaf8a3acf9b094a326dfb1cd0537c75a0d",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 235,
+        "line_number": 104,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -1356,15 +1356,7 @@
         "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 94,
-        "type": "Secret Keyword",
-        "verified_result": null
-      },
-      {
-        "hashed_secret": "505032eaf8a3acf9b094a326dfb1cd0537c75a0d",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 364,
+        "line_number": 68,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -1803,14 +1795,6 @@
         "line_number": 75,
         "type": "Secret Keyword",
         "verified_result": null
-      },
-      {
-        "hashed_secret": "1348b145fa1a555461c1b790a2f66614781091e9",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 153,
-        "type": "Private Key",
-        "verified_result": null
       }
     ],
     "ibm/service/codeengine/resource_ibm_code_engine_app.go": [
@@ -1941,14 +1925,6 @@
         "line_number": 135,
         "type": "Secret Keyword",
         "verified_result": null
-      },
-      {
-        "hashed_secret": "1348b145fa1a555461c1b790a2f66614781091e9",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 276,
-        "type": "Private Key",
-        "verified_result": null
       }
     ],
     "ibm/service/contextbasedrestrictions/data_source_ibm_cbr_rule_test.go": [
@@ -2022,7 +1998,7 @@
         "hashed_secret": "884a58e4c2c5d195d3876787bdc63af6c5af2924",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1589,
+        "line_number": 1595,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2080,31 +2056,31 @@
         "hashed_secret": "deab23f996709b4e3d14e5499d1cc2de677bfaa8",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1314,
+        "line_number": 1331,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "20a25bac21219ffff1904bde871ded4027eca2f8",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1901,
+        "line_number": 1918,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1920,
+        "line_number": 1937,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 2135,
+        "line_number": 2152,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2164,15 +2140,15 @@
         "hashed_secret": "8cbbbfad0206e5953901f679b0d26d583c4f5ffe",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 215,
+        "line_number": 271,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "2317aa72dafa0a07f05af47baa2e388f95dcf6f3",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 280,
+        "line_number": 336,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2982,7 +2958,7 @@
         "hashed_secret": "3c2ecad9b250fd6d99893e4d05ec02ca19aa95d0",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 383,
+        "line_number": 389,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -4538,15 +4514,15 @@
         "hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 104,
+        "line_number": 105,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 106,
+        "line_number": 107,
         "type": "Secret Keyword",
         "verified_result": null
       }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# 1.60.0-beta0 (Nov 15, 2023)
+Features
+* Support for Projects
+   - **Datasources**
+       - ibm_project
+       - ibm_project_config 
+   - **Resources**
+        - ibm_project
+        - ibm_project_config 
+Enhancements
+* support offline restore for MongoDB EE PITR ([4601](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4601))
+* bump ContinuousDelivery Go SDK version ([4918](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4918))
+* Added nest conditions to rule.conditions IAM Policies ([4896](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4896))
+* Updates to SCC tool ([4920](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4920))
+
+BugFixes
+* resolved nil pointer issue on vpn gateway resource ([4903](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4903))
+* Private/direct COS endpoint settings conflicts with IBM Cloud docs, VPE options, and COS config endpoint ([4919](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4919))
+* add missing required argument name to the doc ([4909](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4909))
+
+
 # 1.59.0 (Oct 30, 2023)
 
 Features

diff --git a/README.md b/README.md
@@ -124,11 +124,19 @@ Issuing `make testacc` will now run the testcase with names matching `TestAccIBM
 
 You will also need to export the following environment variables for running the Acceptance tests.
 * `IC_API_KEY`- The IBM Cloud API Key
+* `IC_REGION` - The IBM Cloud [region](https://cloud.ibm.com/docs/overview?topic=overview-locations) used by test resources - defaults to `us-south`
 * `IAAS_CLASSIC_API_KEY` - The IBM Cloud Classic Infrastructure API Key
 * `IAAS_CLASSIC_USERNAME` - The IBM Cloud Classic Infrastructure username associated with the Classic InfrastAPI Key.
 
 Additional environment variables may be required depending on the tests being run. Check console log for warning messages about required variables. 
 
+Alternatively, look for the name of the function by PreCheck under the specific test case and inspect [ibm/acctest/acctest.go](https://github.com/IBM-Cloud/terraform-provider-ibm/blob/master/ibm/acctest/acctest.go) to find the list of environment variables required for the test.
+
+```
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { acc.TestAccPreCheck(t) },
+		Providers:    acc.TestAccProviders,
+```
 
 # IBM Cloud Ansible Modules
 

diff --git a/examples/ibm-code-engine/README.md b/examples/ibm-code-engine/README.md
@@ -8,6 +8,7 @@ The following types of resources are supported:
 * code_engine_binding
 * code_engine_build
 * code_engine_config_map
+* code_engine_domain_mapping
 * code_engine_job
 * code_engine_project
 * code_engine_secret
@@ -117,6 +118,20 @@ resource "ibm_code_engine_binding" "code_engine_secret_instance" {
 }
 ```
 
+code_engine_domain_mapping resource:
+
+```hcl
+resource "ibm_code_engine_domain_mapping" "code_engine_domain_mapping_instance" {
+  project_id = var.code_engine_project_id
+  name       = var.code_engine_domain_mapping_name
+  component {
+    name          = var.code_engine_domain_mapping_component_name
+    resource_type = var.code_engine_domain_mapping_component_resource_type
+  }
+  tls_secret = var.code_engine_binding_secret_name
+}
+```
+
 ## CodeEngineV2 Data sources
 
 code_engine_project data source:
@@ -176,12 +191,21 @@ data "ibm_code_engine_secret" "code_engine_secret_instance" {
 code_engine_binding data source:
 
 ```hcl
-data "ibm_code_engine_secret" "code_engine_secret_instance" {
+data "ibm_code_engine_binding" "code_engine_binding_instance" {
   project_id = var.code_engine_project_id
   binding_id = var.code_engine_binding_id
 }
 ```
 
+code_engine_domain_mapping data source:
+
+```hcl
+data "ibm_code_engine_domain_mapping" "code_engine_domain_mapping_instance" {
+  project_id = var.code_engine_project_id
+  name       = var.code_engine_domain_mapping_name
+}
+```
+
 ## Inputs
 
 | Name | Description | Type | Required |
@@ -234,6 +258,7 @@ data "ibm_code_engine_secret" "code_engine_secret_instance" {
 | resource_group_id | Optional ID of the resource group for your project deployment. If this field is not defined, the default resource group of the account will be used. | `string` | false |
 | format | Specify the format of the secret. | `string` | true |
 | service_access | Properties for Service Access Secret Prototypes. | `` | false |
+| tls_secret | The name of the TLS secret that holds the certificate and private key of the domain mapping. | `string` | true |
 
 ## Outputs
 
@@ -244,5 +269,6 @@ data "ibm_code_engine_secret" "code_engine_secret_instance" {
 | code_engine_binding | code_engine_binding object |
 | code_engine_build | code_engine_build object |
 | code_engine_config_map | code_engine_config_map object |
+| code_engine_domain_mapping | code_engine_domain_mapping object |
 | code_engine_job | code_engine_job object |
 | code_engine_secret | code_engine_secret object |