disabling compartment export on keystore resource for pending upstream change

Author: varmax2511

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Added
 - Support for reading OBO token from local file
+- Support for Oracle Key Vault with ExaCC
 
 ## 4.0.0 (October 21, 2020)
 

oci/database_key_store_resource.go

@@ -34,6 +34,7 @@ func DatabaseKeyStoreResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
 			"display_name": {
 				Type:     schema.TypeString,
@@ -266,15 +267,15 @@ func (s *DatabaseKeyStoreResourceCrud) Get() error {
 }
 
 func (s *DatabaseKeyStoreResourceCrud) Update() error {
-	if compartment, ok := s.D.GetOkExists("compartment_id"); ok && s.D.HasChange("compartment_id") {
+	/*if compartment, ok := s.D.GetOkExists("compartment_id"); ok && s.D.HasChange("compartment_id") {
 		oldRaw, newRaw := s.D.GetChange("compartment_id")
 		if newRaw != "" && oldRaw != "" {
 			err := s.updateCompartment(compartment)
 			if err != nil {
 				return err
 			}
 		}
-	}
+	}*/
 	request := oci_database.UpdateKeyStoreRequest{}
 
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {

oci/database_key_store_test.go

@@ -69,8 +69,8 @@ func TestDatabaseKeyStoreResource_basic(t *testing.T) {
 	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
-	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
-	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
+	//compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	//compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
 
 	resourceName := "oci_database_key_store.test_key_store"
 	datasourceName := "data.oci_database_key_stores.test_key_stores"
@@ -139,7 +139,7 @@ func TestDatabaseKeyStoreResource_basic(t *testing.T) {
 			},
 
 			// verify update to the compartment (the compartment will be switched back in the next step)
-			{
+			/*{
 				Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + KeyStoreResourceDependencies +
 					generateResourceFromRepresentationMap("oci_database_key_store", "test_key_store", Optional, Create,
 						representationCopyWithNewProperties(keyStoreRepresentation, map[string]interface{}{
@@ -166,7 +166,7 @@ func TestDatabaseKeyStoreResource_basic(t *testing.T) {
 						return err
 					},
 				),
-			},
+			},*/
 
 			// verify updates to updatable parameters
 			{

website/docs/r/database_key_store.html.markdown

@@ -40,7 +40,7 @@ resource "oci_database_key_store" "test_key_store" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
+* `compartment_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
 * `defined_tags` - (Optional) (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). 
 * `display_name` - (Required) The user-friendly name for the key store. The name does not need to be unique.
 * `freeform_tags` - (Optional) (Updatable) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`