wip

Author: ilia-medvedev-codefresh

codefresh/context/storage.go

@@ -54,7 +54,7 @@ func flattenStorageContextConfig(spec cfclient.ContextSpec, auth map[string]inte
 func FlattenJsonConfigStorageContextConfig(spec cfclient.ContextSpec) []interface{} {
 	auth := make(map[string]interface{})
 	auth["json_config"] = spec.Data["auth"].(map[string]interface{})["jsonConfig"]
-	auth["type"] = spec.Data["type"]
+	auth["type"] = spec.Data["auth"].(map[string]interface{})["type"]
 	return flattenStorageContextConfig(spec, auth)
 }
 

codefresh/resource_context.go

@@ -31,6 +31,8 @@ var supportedContextType = []string{
 var encryptedContextTypes = []string{
 	contextSecret,
 	contextSecretYaml,
+	contextS3Storage,
+	contextAzureStorage,
 }
 
 func getConflictingContexts(context string) []string {

codefresh/resource_context_test.go

@@ -129,7 +129,7 @@ func TestAccCodefreshContextSecretYaml(t *testing.T) {
 		CheckDestroy: testAccCheckCodefreshContextDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCodefreshContextSecretYaml(name, "rootKey", "plainKey", "plainValue", "listKey", "listValue1", "listValue2"),
+				Config: testAccCodefreshContextSecretYaml(name, "rootKey", "plainKey", "plainValue", "listKey", "listValue1", "listValue2", true),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCodefreshContextExists(resourceName),
 					resource.TestCheckResourceAttr(resourceName, "name", name),
@@ -159,7 +159,7 @@ func testAccCheckCodefreshContextExists(resource string) resource.TestCheckFunc
 		contextID := rs.Primary.ID
 
 		apiClient := testAccProvider.Meta().(*cfclient.Client)
-		_, err := apiClient.GetContext(contextID, true)
+		_, err := apiClient.GetContext(contextID, false)
 
 		if err != nil {
 			return fmt.Errorf("error fetching context with ID %s. %s", contextID, err)
@@ -177,7 +177,7 @@ func testAccCheckCodefreshContextDestroy(s *terraform.State) error {
 			continue
 		}
 
-		_, err := apiClient.GetContext(rs.Primary.ID, true)
+		_, err := apiClient.GetContext(rs.Primary.ID, false)
 
 		if err == nil {
 			return fmt.Errorf("Alert still exists")
@@ -249,18 +249,20 @@ resource "codefresh_context" "test" {
 `, rName, rootKey, plainKey, plainValue, listKey, listValue1, listValue2)
 }
 
-func testAccCodefreshContextSecretYaml(rName, rootKey, plainKey, plainValue, listKey, listValue1, listValue2 string) string {
+func testAccCodefreshContextSecretYaml(rName, rootKey, plainKey, plainValue, listKey, listValue1, listValue2 string, decryptSpec bool) string {
 
 	return fmt.Sprintf(`
 resource "codefresh_context" "test" {
 
   name = "%s"
 
+  decrypt_spec = %v
+
   spec {
 	secretyaml {
 		data = "%s: \n %s: %s\n %s: \n  - %s\n  - %s"
 	}
   }
 }
-`, rName, rootKey, plainKey, plainValue, listKey, listValue1, listValue2)
+`, rName, decryptSpec, rootKey, plainKey, plainValue, listKey, listValue1, listValue2)
 }