refreshing the provider for intersight version 16711 (#272)

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Logs
 
+## v1.0.49 
+* Refreshes the terraform module to be in sync with the latest Cisco Intersight model (build 16711)
+
 ## v1.0.48 
 * Refreshes the terraform module to be in sync with the latest Cisco Intersight model (build 16342)
 

GNUmakefile

@@ -1,5 +1,5 @@
 PKG_NAME=intersight
-VERSION=1.0.48
+VERSION=1.0.49
 TEST?=$$(go list ./... |grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 WEBSITE_REPO=github.com/hashicorp/terraform-website

examples/sample_modules/os_install/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.48"
+      version = "1.0.49"
     }
   }
 }

examples/sample_modules/server_configurations/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.48"
+      version = "1.0.49"
     }
   }
 }

examples/sample_modules/server_deployment/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.48"
+      version = "1.0.49"
     }
   }
 }

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/apparentlymart/go-textseg v1.0.0 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/golang/protobuf v1.4.2 // indirect
-	github.com/google/go-cmp v0.5.2 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
 	github.com/hashicorp/go-hclog v0.15.0 // indirect
@@ -34,9 +34,9 @@ require (
 	github.com/oklog/run v1.0.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/zclconf/go-cty v1.2.1 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
 	google.golang.org/grpc v1.32.0 // indirect

go.sum

@@ -119,8 +119,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -326,8 +327,8 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -373,15 +374,15 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -429,7 +430,6 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=

intersight/config.go

@@ -83,8 +83,9 @@ func (c *Client) getHttpSignatureContext(ctx context.Context, flagKeyId string,
 	authCfg := gosdk.HttpSignatureAuth{
 		KeyId:            flagKeyId,
 		Passphrase:       "",
-		SigningScheme:    gosdk.HttpSigningSchemeRsaSha256,
+		SigningScheme:    gosdk.HttpSigningSchemeHs2019,
 		SigningAlgorithm: gosdk.HttpSigningAlgorithmRsaPKCS1v15,
+		HashAlgorithm:    gosdk.HttpHashAlgorithmSha256,
 		SignedHeaders: []string{
 			gosdk.HttpSignatureParameterRequestTarget,
 			gosdk.HttpSignatureParameterCreated,
@@ -96,6 +97,7 @@ func (c *Client) getHttpSignatureContext(ctx context.Context, flagKeyId string,
 		},
 		SignatureMaxValidity: 10 * time.Minute,
 	}
+
 	//Set Private Key or Private Key Path
 	if _, err := os.Stat(flagSecretKey); err != nil {
 		// not a file, therefore is string

intersight/data_source_intersight_adapter_host_eth_interface.go

@@ -56,6 +56,16 @@ func getAdapterHostEthInterfaceSchema() map[string]*schema.Schema {
 				},
 			},
 		},
+		"active_oper_state": {
+			Description: "The operational state of the Active vNIC. vNIC operational state information is updated by events from the adapter. This operational state is applicable to primary vNIC. If a host is powered off, this property might not be accurate as we may or may not receive events from the adapter. For Intersight Managed Domains Mode domains (IMM), the vNIC's peer object Vethernet will have the current operational state of the connection when a host is powered off.",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
+		"active_veth_oper_state": {
+			Description: "The operational state of the Active Vethernet peer of a vNIC in Intersight Managed Mode. This state is updated by events from Fabric Interconnect or by periodic updates from Fabric Interconnect. When a Fabric Interconnect is not connected to Intersight or if the Fabric Interconnect is powered down, this property will not be updated. This state is not applicable for standalone servers.\n* `unknown` - The operational state of the Vethernet is not known.\n* `adminDown` - The operational state of the Vethernet is admin down.\n* `up` - The operational state of the Vethernet is Up.\n* `down` - The operational state of the Vethernet is Down.\n* `noLicense` - The operational state of the Vethernet is no license.\n* `linkUp` - The operational state of the Vethernet is link up.\n* `hardwareFailure` - The operational state of the Vethernet is hardware failure.\n* `softwareFailure` - The operational state of the Vethernet is software failure.\n* `errorDisabled` - The operational state of the Vethernet is error disabled.\n* `linkDown` - The operational state of the Vethernet is link down.\n* `sfpNotPresent` - The operational state of the Vethernet is SFP not present.\n* `udldAggrDown` - The operational state of the Vethernet is UDLD aggregate down.",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
 		"adapter_unit": {
 			Description: "A reference to a adapterUnit resource.\nWhen the $expand query parameter is specified, the referenced resource is returned inline.",
 			Type:        schema.TypeList,
@@ -470,7 +480,12 @@ func getAdapterHostEthInterfaceSchema() map[string]*schema.Schema {
 			Optional:    true,
 		},
 		"standby_oper_state": {
-			Description: "Standby Operational state of an Interface.",
+			Description: "The operational state of the standby vNIC. vNIC operational state information is updated by events from the adapter. This operational state is applicable only to failover vNIC. If a host is powered off, this property might not be accurate as we may or may not receive events from the adapter. For Intersight Managed Mode domains (IMM), the vNIC's peer object Vethernet will have the current operational state of the connection when a host is powered off.",
+			Type:        schema.TypeString,
+			Optional:    true,
+		},
+		"standby_veth_oper_state": {
+			Description: "The operational state of the Standby Vethernet peer of a failover vNIC in Intersight Managed Mode. This state is updated by events from Fabric Interconnect or by periodic updates from Fabric Interconnect. When a Fabric Interconnect is not connected to Intersight or if the Fabric Interconnect is powered down, this property will not be updated. This state is not applicable for standalone servers.\n* `unknown` - The operational state of the Vethernet is not known.\n* `adminDown` - The operational state of the Vethernet is admin down.\n* `up` - The operational state of the Vethernet is Up.\n* `down` - The operational state of the Vethernet is Down.\n* `noLicense` - The operational state of the Vethernet is no license.\n* `linkUp` - The operational state of the Vethernet is link up.\n* `hardwareFailure` - The operational state of the Vethernet is hardware failure.\n* `softwareFailure` - The operational state of the Vethernet is software failure.\n* `errorDisabled` - The operational state of the Vethernet is error disabled.\n* `linkDown` - The operational state of the Vethernet is link down.\n* `sfpNotPresent` - The operational state of the Vethernet is SFP not present.\n* `udldAggrDown` - The operational state of the Vethernet is UDLD aggregate down.",
 			Type:        schema.TypeString,
 			Optional:    true,
 		},
@@ -775,6 +790,16 @@ func dataSourceAdapterHostEthInterfaceRead(c context.Context, d *schema.Resource
 		}
 	}
 
+	if v, ok := d.GetOk("active_oper_state"); ok {
+		x := (v.(string))
+		o.SetActiveOperState(x)
+	}
+
+	if v, ok := d.GetOk("active_veth_oper_state"); ok {
+		x := (v.(string))
+		o.SetActiveVethOperState(x)
+	}
+
 	if v, ok := d.GetOk("adapter_unit"); ok {
 		p := make([]models.AdapterUnitRelationship, 0, 1)
 		s := v.([]interface{})
@@ -1269,6 +1294,11 @@ func dataSourceAdapterHostEthInterfaceRead(c context.Context, d *schema.Resource
 		o.SetStandbyOperState(x)
 	}
 
+	if v, ok := d.GetOk("standby_veth_oper_state"); ok {
+		x := (v.(string))
+		o.SetStandbyVethOperState(x)
+	}
+
 	if v, ok := d.GetOk("standby_vethernet"); ok {
 		p := make([]models.NetworkVethernetRelationship, 0, 1)
 		s := v.([]interface{})
@@ -1525,6 +1555,8 @@ func dataSourceAdapterHostEthInterfaceRead(c context.Context, d *schema.Resource
 				temp["account_moid"] = (s.GetAccountMoid())
 
 				temp["acknowledged_peer_interface"] = flattenMapEtherPhysicalPortBaseRelationship(s.GetAcknowledgedPeerInterface(), d)
+				temp["active_oper_state"] = (s.GetActiveOperState())
+				temp["active_veth_oper_state"] = (s.GetActiveVethOperState())
 
 				temp["adapter_unit"] = flattenMapAdapterUnitRelationship(s.GetAdapterUnit(), d)
 				temp["additional_properties"] = flattenAdditionalProperties(s.AdditionalProperties)
@@ -1571,6 +1603,7 @@ func dataSourceAdapterHostEthInterfaceRead(c context.Context, d *schema.Resource
 				temp["rn"] = (s.GetRn())
 				temp["shared_scope"] = (s.GetSharedScope())
 				temp["standby_oper_state"] = (s.GetStandbyOperState())
+				temp["standby_veth_oper_state"] = (s.GetStandbyVethOperState())
 
 				temp["standby_vethernet"] = flattenMapNetworkVethernetRelationship(s.GetStandbyVethernet(), d)
 				temp["standby_vif_id"] = (s.GetStandbyVifId())