move contexts schema to dedicated folder

Author: pasha-codefresh

.gitignore

@@ -4,4 +4,8 @@ dist/
 **/.terraform
 **/terraform.tfstate
 **/terraform.tfstate.backup
-tests/
+tests/
+
+.idea
+**/*.lock.hcl
+**/*.backup

codefresh/context/storage.go

@@ -0,0 +1,44 @@
+package context
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func GcsSchema() *schema.Schema {
+	return &schema.Schema{
+		Type:     schema.TypeList,
+		Optional: true,
+		ForceNew: true,
+		MaxItems: 1,
+		Elem: &schema.Resource{
+			Schema: map[string]*schema.Schema{
+				"data": {
+					Type:     schema.TypeList,
+					Required: true,
+					MaxItems: 1,
+					Elem: &schema.Resource{
+						Schema: map[string]*schema.Schema{
+							"auth": {
+								Type:     schema.TypeList,
+								Required: true,
+								MaxItems: 1,
+								Elem: &schema.Resource{
+									Schema: map[string]*schema.Schema{
+										"type": {
+											Type:     schema.TypeString,
+											Required: true,
+										},
+										"json_config": {
+											Type:     schema.TypeMap,
+											Required: true,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}

codefresh/resource_context.go

@@ -1,6 +1,7 @@
 package codefresh
 
 import (
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/context"
 	"log"
 
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
@@ -136,43 +137,7 @@ func resourceContext() *schema.Resource {
 								},
 							},
 						},
-						normalizeFieldName(contextGoogleStorage): {
-							Type:          schema.TypeList,
-							Optional:      true,
-							ForceNew:      true,
-							MaxItems:      1,
-							ConflictsWith: getConflictingContexts(contextGoogleStorage),
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"data": {
-										Type:     schema.TypeList,
-										Required: true,
-										MaxItems: 1,
-										Elem: &schema.Resource{
-											Schema: map[string]*schema.Schema{
-												"auth": {
-													Type:     schema.TypeList,
-													Required: true,
-													MaxItems: 1,
-													Elem: &schema.Resource{
-														Schema: map[string]*schema.Schema{
-															"type": {
-																Type:     schema.TypeString,
-																Required: true,
-															},
-															"json_config": {
-																Type:     schema.TypeMap,
-																Required: true,
-															},
-														},
-													},
-												},
-											},
-										},
-									},
-								},
-							},
-						},
+						normalizeFieldName(contextGoogleStorage): context.GcsSchema(),
 					},
 				},
 			},
@@ -260,10 +225,6 @@ func mapContextToResource(context cfClient.Context, d *schema.ResourceData) erro
 		return err
 	}
 
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 

examples/storate_integration/main.tf

@@ -1,7 +1,3 @@
-//data "codefresh_context" "storage_integration" {
-//  name = "pasha-test-t"
-//}
-
 resource "codefresh_context" "storage_integration" {
   for_each = toset(["create"])
   name = "pasha-test-t2"