Merge branch 'master' into satellite-storage-terraform

.secrets.baseline

@@ -637,6 +637,16 @@
         "verified_result": null
       }
     ],
+    "examples/ibm-scc/profile/main.tf": [
+      {
+        "hashed_secret": "ba02c5a1aad447298fcfbd962a953e7706b8b430",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 25,
+        "type": "Hex High Entropy String",
+        "verified_result": null
+      }
+    ],
     "examples/ibm-schematics/README.md": [
       {
         "hashed_secret": "5ffafdbd72224c86c3601bacfa0b6f04f308b9f6",
@@ -732,23 +742,23 @@
         "hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 355,
+        "line_number": 353,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 361,
+        "line_number": 359,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1067,
+        "line_number": 1065,
         "type": "Base64 High Entropy String",
         "verified_result": null
       }
@@ -758,47 +768,47 @@
         "hashed_secret": "9184b0c38101bf24d78b2bb0d044deb1d33696fc",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 134,
+        "line_number": 130,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "c427f185ddcb2440be9b77c8e45f1cd487a2e790",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1468,
+        "line_number": 1427,
         "type": "Base64 High Entropy String",
         "verified_result": null
       },
       {
         "hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1536,
+        "line_number": 1494,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "1f614c2eb6b3da22d89bd1b9fd47d7cb7c8fc670",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 3433,
+        "line_number": 3248,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "7abfce65b8504403afc25c9790f358d513dfbcc6",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 3446,
+        "line_number": 3261,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "0c2d85bf9a9b1579b16f220a4ea8c3d62b2e24b1",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 3487,
+        "line_number": 3302,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2885,6 +2895,36 @@
         "verified_result": null
       }
     ],
+    "ibm/service/scc/data_source_ibm_scc_provider_type_instance_test.go": [
+      {
+        "hashed_secret": "83747cea2b26d7652ed39218ddcdb1461c570535",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 80,
+        "type": "Hex High Entropy String",
+        "verified_result": null
+      }
+    ],
+    "ibm/service/scc/data_source_ibm_scc_provider_type_test.go": [
+      {
+        "hashed_secret": "83747cea2b26d7652ed39218ddcdb1461c570535",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 43,
+        "type": "Hex High Entropy String",
+        "verified_result": null
+      }
+    ],
+    "ibm/service/scc/resource_ibm_scc_provider_type_instance_test.go": [
+      {
+        "hashed_secret": "83747cea2b26d7652ed39218ddcdb1461c570535",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 95,
+        "type": "Hex High Entropy String",
+        "verified_result": null
+      }
+    ],
     "ibm/service/schematics/data_source_ibm_schematics_action.go": [
       {
         "hashed_secret": "49f3bb8f759241df51c899d3725d877bad58f66e",

examples/ibm-key-protect/README.md

@@ -4,10 +4,6 @@ This example shows how to Create a Key protect instance, generate a key and inte
 
 This sample configuration will create the key protect instance, cos-bucket instance, root key, and integrate the key with a cos bucket after creating the bucket.
 
-  **Note:**
-
- `key_protect` attribute to associate a kms_key with a COS bucket has been renamed as `kms_key_crn` , hence it is recommended to all the new users to use `kms_key_crn`.Although the support for older attribute name `key_protect` will be continued for existing custom
-
 To run, configure your IBM Cloud provider
 
 These types of resources and datasources are supported:
@@ -21,6 +17,12 @@ Terraform 0.12. Pin module version to `~> v1.4.0`. Branch - `master`.
 
 Terraform 0.11. Pin module version to `~> v0.25.0`. Branch - `terraform_v0.11.x`.
 
+## Deprecation Notice
+
+  The resource `ibm_kp_key` is deprecated and replaced with `ibm_kms_key`. 
+
+  Please refer to [https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples/ibm-kms](examples/ibm-kms) for examples.
+
 ## Usage
 
 To run this example you need to execute: