Skip to content

Commit

Permalink
Merge pull request #18183 from hashicorp/deps/go-azure-sdk-v0.2022083…
Browse files Browse the repository at this point in the history
…0.1105041

Dependencies: update `go-azure-sdk` to `v0.20220830.1105041`
  • Loading branch information
tombuildsstuff authored Aug 30, 2022
2 parents 20b663d + 6baa233 commit 8924a86
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
16 changes: 8 additions & 8 deletions internal/services/containers/container_group_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -1475,26 +1475,26 @@ 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{})),
}
}
}
}
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)),
}
Expand All @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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),
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,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
Expand Down

0 comments on commit 8924a86

Please sign in to comment.