gcorelabscloud-go version updated, attach instance interface fixed

Author: [Partner] Alexander Sokolov

gcore/resource_gcore_instance.go

@@ -11,7 +11,6 @@ import (
 	gcorecloud "github.com/G-Core/gcorelabscloud-go"
 	"github.com/G-Core/gcorelabscloud-go/gcore/instance/v1/instances"
 	"github.com/G-Core/gcorelabscloud-go/gcore/instance/v1/types"
-	"github.com/G-Core/gcorelabscloud-go/gcore/securitygroup/v1/securitygroups"
 	"github.com/G-Core/gcorelabscloud-go/gcore/task/v1/tasks"
 	"github.com/G-Core/gcorelabscloud-go/gcore/volume/v1/volumes"
 	"github.com/hashicorp/go-cty/cty"
@@ -212,7 +211,6 @@ func resourceInstance() *schema.Resource {
 						"security_groups": {
 							Type:        schema.TypeList,
 							Optional:    true,
-							Computed:    true,
 							Description: "list of security group IDs",
 							Elem:        &schema.Schema{Type: schema.TypeString},
 						},
@@ -815,7 +813,10 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 			iface := i.(map[string]interface{})
 
 			iType := types.InterfaceType(iface["type"].(string))
-			opts := instances.InterfaceOpts{Type: iType}
+			opts := instances.InterfaceInstanceCreateOpts{
+				InterfaceOpts: instances.InterfaceOpts{Type: iType},
+			}
+
 			switch iType {
 			case types.SubnetInterfaceType:
 				opts.SubnetID = iface["subnet_id"].(string)
@@ -825,6 +826,13 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 				opts.PortID = iface["port_id"].(string)
 			}
 
+			rawSgsID := iface["security_groups"].([]interface{})
+			sgs := make([]gcorecloud.ItemID, len(rawSgsID))
+			for i, sgID := range rawSgsID {
+				sgs[i] = gcorecloud.ItemID{ID: sgID.(string)}
+			}
+			opts.SecurityGroups = sgs
+
 			log.Printf("[DEBUG] attach interface: %+v", opts)
 			results, err := instances.AttachInterface(client, instanceID, opts).Extract()
 			if err != nil {
@@ -833,7 +841,7 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 
 			taskID := results.Tasks[0]
 			log.Printf("[DEBUG] attach interface taskID: %s", taskID)
-			portIDRaw, err := tasks.WaitTaskAndReturnResult(client, taskID, true, InstanceCreatingTimeout, func(task tasks.TaskID) (interface{}, error) {
+			_, err = tasks.WaitTaskAndReturnResult(client, taskID, true, InstanceCreatingTimeout, func(task tasks.TaskID) (interface{}, error) {
 				taskInfo, err := tasks.Get(client, string(task)).Extract()
 				if err != nil {
 					return nil, fmt.Errorf("cannot get task with ID: %s. Error: %w, task: %+v", task, err, taskInfo)
@@ -846,46 +854,10 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 			},
 			)
 
-			var portID string
 			if err != nil {
-				if opts.PortID != "" {
-					portID = opts.PortID
-				} else {
-					return diag.FromErr(err)
-				}
-			} else {
-				portID = portIDRaw.(string)
+				return diag.FromErr(err)
 			}
 
-			// attach security group to interface
-			sgIDs := iface["security_groups"].([]interface{})
-			if len(sgIDs) > 0 {
-				sgClient, err := CreateClient(provider, d, securityGroupPoint, versionPointV1)
-				if err != nil {
-					return diag.FromErr(err)
-				}
-
-				sgsName := make([]string, len(sgIDs))
-				for i, sgID := range sgIDs {
-					sg, err := securitygroups.Get(sgClient, sgID.(string)).Extract()
-					if err != nil {
-						return diag.FromErr(err)
-					}
-					sgsName[i] = sg.Name
-				}
-
-				attachOpts := instances.SecurityGroupOpts{
-					PortsSecurityGroupNames: []instances.PortSecurityGroupNames{{
-						PortID:             &portID,
-						SecurityGroupNames: sgsName,
-					}},
-				}
-
-				log.Printf("[DEBUG] attach security group opts: %+v", attachOpts)
-				if err := instances.AssignSecurityGroup(client, instanceID, attachOpts).Err; err != nil {
-					return diag.Errorf("cannot assign security group. Error: %s", err.Error())
-				}
-			}
 		}
 	}
 

go.mod

@@ -2,14 +2,12 @@ module github.com/terraform-providers/terraform-provider-gcorelabs
 
 go 1.17
 
-//replace github.com/G-Core/gcorelabscloud-go => /home/ondi/go/src/github.com/G-Core/gcorelabscloud-go
-
 require (
 	github.com/AlekSi/pointer v1.2.0
 	github.com/G-Core/gcore-dns-sdk-go v0.2.3
 	github.com/G-Core/gcore-storage-sdk-go v0.1.3
 	github.com/G-Core/gcorelabscdn-go v0.1.20
-	github.com/G-Core/gcorelabscloud-go v0.5.0
+	github.com/G-Core/gcorelabscloud-go v0.5.2
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
 	github.com/mitchellh/mapstructure v1.4.3

go.sum

@@ -85,10 +85,8 @@ github.com/G-Core/gcore-storage-sdk-go v0.1.3 h1:vzgt5pKB3jsxbUs7jdEX1jyRC2YqbwL
 github.com/G-Core/gcore-storage-sdk-go v0.1.3/go.mod h1:e/5w5R2Uh6T7g6oAc5SpTKZJInFG6FyYYvGpUgRwCQ4=
 github.com/G-Core/gcorelabscdn-go v0.1.20 h1:RT/k4olBTPuVyE2LUlu5D9GTvj3hPA9NnBZwXYHFZxc=
 github.com/G-Core/gcorelabscdn-go v0.1.20/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
-github.com/G-Core/gcorelabscloud-go v0.4.54 h1:KDMRSGj/StmvFyqdIFng5Eb4eZB5W5GgIHZzrysh8VY=
-github.com/G-Core/gcorelabscloud-go v0.4.54/go.mod h1:nuDFy76Eja1EXBrG+q+dqpC2KqrHfID3JS8833LDJG8=
-github.com/G-Core/gcorelabscloud-go v0.5.0 h1:PMnk2a+1VxviGcktHXZS4iIO2K1bvclsele6DMfLAr8=
-github.com/G-Core/gcorelabscloud-go v0.5.0/go.mod h1:nuDFy76Eja1EXBrG+q+dqpC2KqrHfID3JS8833LDJG8=
+github.com/G-Core/gcorelabscloud-go v0.5.2 h1:KoBre603zAwh7yJPNVDgAwXwwyz6v5xL0UXqr8kRL78=
+github.com/G-Core/gcorelabscloud-go v0.5.2/go.mod h1:nuDFy76Eja1EXBrG+q+dqpC2KqrHfID3JS8833LDJG8=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=