Support for step-type with versions

Author: sandrogattuso

client/step_types.go

@@ -6,6 +6,15 @@ import (
 	"net/url"
 )
 
+type StepTypesVersions struct {
+	Name     string
+	Versions []StepTypesVersion
+}
+type StepTypesVersion struct {
+	VersionNumber string
+	StepTypes     StepTypes
+}
+
 type StepTypes struct {
 	Version  string                 `json:"version,omitempty"`
 	Kind     string                 `json:"kind,omitempty"`
@@ -76,7 +85,7 @@ func (client *Client) CreateStepTypes(stepTypes *StepTypes) (*StepTypes, error)
 	if err != nil {
 		return nil, err
 	}
-	log.Printf("[DEBUG] Response step types: %q", resp)
+
 	var respStepTypes StepTypes
 	err = DecodeResponseInto(resp, &respStepTypes)
 	if err != nil {
@@ -96,7 +105,7 @@ func (client *Client) UpdateStepTypes(stepTypes *StepTypes) (*StepTypes, error)
 		return nil, err
 	}
 
-	fullPath := fmt.Sprintf("/step-types/%s", url.PathEscape(stepTypes.GetID()+":"+stepTypes.Metadata["version"].(string)))
+	fullPath := fmt.Sprintf("/step-types/%s", url.PathEscape(stepTypes.Metadata["name"].(string)+":"+stepTypes.Metadata["version"].(string)))
 	opts := RequestOptions{
 		Path:   fullPath,
 		Method: "PUT",

codefresh/data_step_types.go

@@ -16,6 +16,10 @@ func dataSourceStepTypes() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"version": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"step_types_yaml": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -29,12 +33,13 @@ func dataSourceStepTypesRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*cfClient.Client)
 	var stepTypes *cfClient.StepTypes
 	var err error
+	identifier := d.Get("name").(string)
+	version, versionOk := d.GetOk("version")
 
-	if name, nameOk := d.GetOk("name"); nameOk {
-		stepTypes, err = client.GetStepTypes(name.(string))
-	} else {
-		return fmt.Errorf("data.codefresh_step_types - must specify name")
+	if versionOk {
+		identifier = identifier + ":" + version.(string)
 	}
+	stepTypes, err = client.GetStepTypes(identifier)
 	if err != nil {
 		return err
 	}

codefresh/provider.go

@@ -38,17 +38,18 @@ func Provider() *schema.Provider {
 			"codefresh_users":               dataSourceUsers(),
 		},
 		ResourcesMap: map[string]*schema.Resource{
-			"codefresh_account":        resourceAccount(),
-			"codefresh_account_admins": resourceAccountAdmins(),
-			"codefresh_api_key":        resourceApiKey(),
-			"codefresh_context":        resourceContext(),
-			"codefresh_idp_accounts":   resourceIDPAccounts(),
-			"codefresh_permission":     resourcePermission(),
-			"codefresh_pipeline":       resourcePipeline(),
-			"codefresh_project":        resourceProject(),
-			"codefresh_step_types":     resourceStepTypes(),
-			"codefresh_user":           resourceUser(),
-			"codefresh_team":           resourceTeam(),
+			"codefresh_account":             resourceAccount(),
+			"codefresh_account_admins":      resourceAccountAdmins(),
+			"codefresh_api_key":             resourceApiKey(),
+			"codefresh_context":             resourceContext(),
+			"codefresh_idp_accounts":        resourceIDPAccounts(),
+			"codefresh_permission":          resourcePermission(),
+			"codefresh_pipeline":            resourcePipeline(),
+			"codefresh_project":             resourceProject(),
+			"codefresh_step_types":          resourceStepTypes(),
+			"codefresh_step_types_versions": resourceStepTypesVersions(),
+			"codefresh_user":                resourceUser(),
+			"codefresh_team":                resourceTeam(),
 		},
 		ConfigureFunc: configureProvider,
 	}

codefresh/resource_step_types.go

@@ -55,8 +55,12 @@ func resourceStepTypesRead(d *schema.ResourceData, meta interface{}) error {
 		d.SetId("")
 		return nil
 	}
+	var stepTypesGetVersion cfClient.StepTypes
+	stepTypesYaml := d.Get("step_types_yaml")
+	yaml.Unmarshal([]byte(stepTypesYaml.(string)), &stepTypesGetVersion)
+	version := stepTypesGetVersion.Metadata["version"].(string)
 
-	stepTypes, err := client.GetStepTypes(stepTypesIdentifier)
+	stepTypes, err := client.GetStepTypes(stepTypesIdentifier + ":" + version)
 	// Remove transient attributes from metadata
 	for _, attribute := range []string{"created_at", "accountId", "id", "updated_at", "latest"} {
 		if _, ok := stepTypes.Metadata[attribute]; ok {
@@ -122,6 +126,7 @@ func resourceStepTypesDelete(d *schema.ResourceData, meta interface{}) error {
 func mapStepTypesToResource(stepTypes cfClient.StepTypes, d *schema.ResourceData) error {
 
 	stepTypesYaml, err := yaml.Marshal(stepTypes)
+	log.Printf("[DEBUG] Marshalled Step Types yaml = %v", string(stepTypesYaml))
 	if err != nil {
 		log.Printf("[DEBUG] Failed to Marshal Step Types yaml = %v", stepTypes)
 		return err