From 6baa23350b97185c3d6af7e21d328da7aba7bb39 Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Tue, 30 Aug 2022 13:06:02 +0200 Subject: [PATCH] update sdk to v0.20220830.1105041, adjust casing fixes in container_group and service_fabric_managed_cluster --- go.mod | 2 +- go.sum | 4 ++-- .../containers/container_group_resource.go | 16 ++++++------- ...service_fabric_managed_cluster_resource.go | 10 ++++---- .../2021-03-01/containerinstance/constants.go | 12 +++++----- .../model_containerhttpget.go | 4 ++-- .../containerinstance/model_containerprobe.go | 2 +- .../containerinstance/model_httpheader.go | 2 +- .../2021-05-01/managedcluster/constants.go | 24 +++++++++---------- .../model_managedclusterproperties.go | 2 +- vendor/modules.txt | 2 +- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index fb0ffa7ff7d4..72ea61c6509a 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/google/go-cmp v0.5.8 github.com/google/uuid v1.1.2 github.com/hashicorp/go-azure-helpers v0.40.0 - github.com/hashicorp/go-azure-sdk v0.20220824.1090858 + github.com/hashicorp/go-azure-sdk v0.20220830.1105041 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-uuid v1.0.3 github.com/hashicorp/go-version v1.6.0 diff --git a/go.sum b/go.sum index d0e6ef68add6..c1989567e546 100644 --- a/go.sum +++ b/go.sum @@ -216,8 +216,8 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg= github.com/hashicorp/go-azure-helpers v0.40.0 h1:NjiyF+jN+0mRdFBU894yzZSxu1SNrbvj8l4rEDpCB0A= github.com/hashicorp/go-azure-helpers v0.40.0/go.mod h1:gcutZ/Hf/O7YN9M3UIvyZ9l0Rxv7Yrc9x5sSfM9cuSw= -github.com/hashicorp/go-azure-sdk v0.20220824.1090858 h1:OPdyEfc24JtC4fhYChE6vC7meCAMbPkgyWZ5ZYPC1W8= -github.com/hashicorp/go-azure-sdk v0.20220824.1090858/go.mod h1:jOhjVttoXh2We/glz4BC/0t0Lo8+M9WQBA4sbAPQPMY= +github.com/hashicorp/go-azure-sdk v0.20220830.1105041 h1:LNW0aW2CMNmfTyN4u+h6yxXrAsRcQdNSWSL/NVs6ZVY= +github.com/hashicorp/go-azure-sdk v0.20220830.1105041/go.mod h1:jOhjVttoXh2We/glz4BC/0t0Lo8+M9WQBA4sbAPQPMY= github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= diff --git a/internal/services/containers/container_group_resource.go b/internal/services/containers/container_group_resource.go index b224c326fff9..8be496efa953 100644 --- a/internal/services/containers/container_group_resource.go +++ b/internal/services/containers/container_group_resource.go @@ -1475,11 +1475,11 @@ func expandContainerProbe(input interface{}) *containerinstance.ContainerProbe { scheme := x["scheme"].(string) httpGetScheme := containerinstance.Scheme(scheme) - probe.HttpGet = &containerinstance.ContainerHttpGet{ + probe.HTTPGet = &containerinstance.ContainerHTTPGet{ Path: pointer.FromString(path), Port: int64(port), Scheme: &httpGetScheme, - HttpHeaders: expandContainerProbeHttpHeaders(x["http_headers"].(map[string]interface{})), + HTTPHeaders: expandContainerProbeHttpHeaders(x["http_headers"].(map[string]interface{})), } } } @@ -1487,14 +1487,14 @@ func expandContainerProbe(input interface{}) *containerinstance.ContainerProbe { return &probe } -func expandContainerProbeHttpHeaders(input map[string]interface{}) *[]containerinstance.HttpHeader { +func expandContainerProbeHttpHeaders(input map[string]interface{}) *[]containerinstance.HTTPHeader { if len(input) == 0 { return nil } - headers := []containerinstance.HttpHeader{} + headers := []containerinstance.HTTPHeader{} for k, v := range input { - header := containerinstance.HttpHeader{ + header := containerinstance.HTTPHeader{ Name: pointer.FromString(k), Value: pointer.FromString(v.(string)), } @@ -1503,7 +1503,7 @@ func expandContainerProbeHttpHeaders(input map[string]interface{}) *[]containeri return &headers } -func flattenContainerProbeHttpHeaders(input *[]containerinstance.HttpHeader) map[string]interface{} { +func flattenContainerProbeHttpHeaders(input *[]containerinstance.HTTPHeader) map[string]interface{} { if input == nil { return nil } @@ -1815,14 +1815,14 @@ func flattenContainerProbes(input *containerinstance.ContainerProbe) []interface } httpGets := make([]interface{}, 0) - if get := input.HttpGet; get != nil { + if get := input.HTTPGet; get != nil { httpGet := make(map[string]interface{}) if v := get.Path; v != nil { httpGet["path"] = *v } httpGet["port"] = get.Port httpGet["scheme"] = get.Scheme - httpGet["http_headers"] = flattenContainerProbeHttpHeaders(get.HttpHeaders) + httpGet["http_headers"] = flattenContainerProbeHttpHeaders(get.HTTPHeaders) httpGets = append(httpGets, httpGet) } output["http_get"] = httpGets diff --git a/internal/services/servicefabricmanaged/service_fabric_managed_cluster_resource.go b/internal/services/servicefabricmanaged/service_fabric_managed_cluster_resource.go index 211f952581b9..eabd1bdb4aa4 100644 --- a/internal/services/servicefabricmanaged/service_fabric_managed_cluster_resource.go +++ b/internal/services/servicefabricmanaged/service_fabric_managed_cluster_resource.go @@ -609,7 +609,7 @@ func (k ClusterResource) CustomizeDiff() sdk.ResourceFunc { for _, lbi := range rd.Get("lb_rule").([]interface{}) { lb := lbi.(map[string]interface{}) probeProto := lb["probe_protocol"].(string) - if probeProto == string(managedcluster.ProbeProtocolHttp) || probeProto == string(managedcluster.ProbeProtocolHttps) { + if probeProto == string(managedcluster.ProbeProtocolHTTP) || probeProto == string(managedcluster.ProbeProtocolHTTPS) { probePath := lb["probe_request_path"] if probePath == nil || probePath.(string) == "" { return fmt.Errorf("probe_request_path needs to be set if probe protocol is %q", probeProto) @@ -721,7 +721,7 @@ func flattenClusterProperties(cluster *managedcluster.ManagedCluster) *ClusterRe } model.ClientConnectionPort = utils.NormaliseNilableInt64(properties.ClientConnectionPort) - model.HTTPGatewayPort = utils.NormaliseNilableInt64(properties.HttpGatewayConnectionPort) + model.HTTPGatewayPort = utils.NormaliseNilableInt64(properties.HTTPGatewayConnectionPort) if lbrules := properties.LoadBalancingRules; lbrules != nil { model.LBRules = make([]LBRule, len(*lbrules)) @@ -887,7 +887,7 @@ func expandClusterProperties(model *ClusterResourceModel) *managedcluster.Manage out.FabricSettings = &fs } - out.HttpGatewayConnectionPort = &model.HTTPGatewayPort + out.HTTPGatewayConnectionPort = &model.HTTPGatewayPort if rules := model.LBRules; len(rules) > 0 { lbRules := make([]managedcluster.LoadBalancingRule, len(rules)) @@ -1212,8 +1212,8 @@ func lbRulesSchema() *pluginsdk.Schema { Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ - string(managedcluster.ProbeProtocolHttp), - string(managedcluster.ProbeProtocolHttps), + string(managedcluster.ProbeProtocolHTTP), + string(managedcluster.ProbeProtocolHTTPS), string(managedcluster.ProbeProtocolTcp), }, false), }, diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/constants.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/constants.go index 71335814b280..49040e7fe701 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/constants.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/constants.go @@ -238,21 +238,21 @@ func parseOperatingSystemTypes(input string) (*OperatingSystemTypes, error) { type Scheme string const ( - SchemeHttp Scheme = "http" - SchemeHttps Scheme = "https" + SchemeHTTP Scheme = "http" + SchemeHTTPS Scheme = "https" ) func PossibleValuesForScheme() []string { return []string{ - string(SchemeHttp), - string(SchemeHttps), + string(SchemeHTTP), + string(SchemeHTTPS), } } func parseScheme(input string) (*Scheme, error) { vals := map[string]Scheme{ - "http": SchemeHttp, - "https": SchemeHttps, + "http": SchemeHTTP, + "https": SchemeHTTPS, } if v, ok := vals[strings.ToLower(input)]; ok { return &v, nil diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_containerhttpget.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_containerhttpget.go index 3ce858f1afe5..1de1246474bb 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_containerhttpget.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_containerhttpget.go @@ -3,8 +3,8 @@ package containerinstance // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See NOTICE.txt in the project root for license information. -type ContainerHttpGet struct { - HttpHeaders *[]HttpHeader `json:"httpHeaders,omitempty"` +type ContainerHTTPGet struct { + HTTPHeaders *[]HTTPHeader `json:"httpHeaders,omitempty"` Path *string `json:"path,omitempty"` Port int64 `json:"port"` Scheme *Scheme `json:"scheme,omitempty"` diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_containerprobe.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_containerprobe.go index 4bdf40dfe5cf..fafcb047b739 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_containerprobe.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_containerprobe.go @@ -6,7 +6,7 @@ package containerinstance type ContainerProbe struct { Exec *ContainerExec `json:"exec,omitempty"` FailureThreshold *int64 `json:"failureThreshold,omitempty"` - HttpGet *ContainerHttpGet `json:"httpGet,omitempty"` + HTTPGet *ContainerHTTPGet `json:"httpGet,omitempty"` InitialDelaySeconds *int64 `json:"initialDelaySeconds,omitempty"` PeriodSeconds *int64 `json:"periodSeconds,omitempty"` SuccessThreshold *int64 `json:"successThreshold,omitempty"` diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_httpheader.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_httpheader.go index b4825abbeea0..ae57ad8dfeb8 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_httpheader.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerinstance/2021-03-01/containerinstance/model_httpheader.go @@ -3,7 +3,7 @@ package containerinstance // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See NOTICE.txt in the project root for license information. -type HttpHeader struct { +type HTTPHeader struct { Name *string `json:"name,omitempty"` Value *string `json:"value,omitempty"` } diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/constants.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/constants.go index 919c6fccb49c..5214ab8bde48 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/constants.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/constants.go @@ -248,8 +248,8 @@ type NsgProtocol string const ( NsgProtocolAh NsgProtocol = "ah" NsgProtocolEsp NsgProtocol = "esp" - NsgProtocolHttp NsgProtocol = "http" - NsgProtocolHttps NsgProtocol = "https" + NsgProtocolHTTP NsgProtocol = "http" + NsgProtocolHTTPS NsgProtocol = "https" NsgProtocolIcmp NsgProtocol = "icmp" NsgProtocolTcp NsgProtocol = "tcp" NsgProtocolUdp NsgProtocol = "udp" @@ -259,8 +259,8 @@ func PossibleValuesForNsgProtocol() []string { return []string{ string(NsgProtocolAh), string(NsgProtocolEsp), - string(NsgProtocolHttp), - string(NsgProtocolHttps), + string(NsgProtocolHTTP), + string(NsgProtocolHTTPS), string(NsgProtocolIcmp), string(NsgProtocolTcp), string(NsgProtocolUdp), @@ -271,8 +271,8 @@ func parseNsgProtocol(input string) (*NsgProtocol, error) { vals := map[string]NsgProtocol{ "ah": NsgProtocolAh, "esp": NsgProtocolEsp, - "http": NsgProtocolHttp, - "https": NsgProtocolHttps, + "http": NsgProtocolHTTP, + "https": NsgProtocolHTTPS, "icmp": NsgProtocolIcmp, "tcp": NsgProtocolTcp, "udp": NsgProtocolUdp, @@ -289,23 +289,23 @@ func parseNsgProtocol(input string) (*NsgProtocol, error) { type ProbeProtocol string const ( - ProbeProtocolHttp ProbeProtocol = "http" - ProbeProtocolHttps ProbeProtocol = "https" + ProbeProtocolHTTP ProbeProtocol = "http" + ProbeProtocolHTTPS ProbeProtocol = "https" ProbeProtocolTcp ProbeProtocol = "tcp" ) func PossibleValuesForProbeProtocol() []string { return []string{ - string(ProbeProtocolHttp), - string(ProbeProtocolHttps), + string(ProbeProtocolHTTP), + string(ProbeProtocolHTTPS), string(ProbeProtocolTcp), } } func parseProbeProtocol(input string) (*ProbeProtocol, error) { vals := map[string]ProbeProtocol{ - "http": ProbeProtocolHttp, - "https": ProbeProtocolHttps, + "http": ProbeProtocolHTTP, + "https": ProbeProtocolHTTPS, "tcp": ProbeProtocolTcp, } if v, ok := vals[strings.ToLower(input)]; ok { diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/model_managedclusterproperties.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/model_managedclusterproperties.go index db07badc23b8..3cb24735b751 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/model_managedclusterproperties.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/servicefabricmanagedcluster/2021-05-01/managedcluster/model_managedclusterproperties.go @@ -22,7 +22,7 @@ type ManagedClusterProperties struct { EnableAutoOSUpgrade *bool `json:"enableAutoOSUpgrade,omitempty"` FabricSettings *[]SettingsSectionDescription `json:"fabricSettings,omitempty"` Fqdn *string `json:"fqdn,omitempty"` - HttpGatewayConnectionPort *int64 `json:"httpGatewayConnectionPort,omitempty"` + HTTPGatewayConnectionPort *int64 `json:"httpGatewayConnectionPort,omitempty"` IPv4Address *string `json:"ipv4Address,omitempty"` LoadBalancingRules *[]LoadBalancingRule `json:"loadBalancingRules,omitempty"` NetworkSecurityRules *[]NetworkSecurityRule `json:"networkSecurityRules,omitempty"` diff --git a/vendor/modules.txt b/vendor/modules.txt index bd4a6241092b..0d4a67ba8b71 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -185,7 +185,7 @@ github.com/hashicorp/go-azure-helpers/resourcemanager/zones github.com/hashicorp/go-azure-helpers/resourceproviders github.com/hashicorp/go-azure-helpers/sender github.com/hashicorp/go-azure-helpers/storage -# github.com/hashicorp/go-azure-sdk v0.20220824.1090858 +# github.com/hashicorp/go-azure-sdk v0.20220830.1105041 ## explicit; go 1.18 github.com/hashicorp/go-azure-sdk/resource-manager/aad/2021-05-01/domainservices github.com/hashicorp/go-azure-sdk/resource-manager/aadb2c/2021-04-01-preview/tenants