Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update azure-go-sdk to v24.0.0 and autorest to v11.2.0 #2572

Merged
merged 6 commits into from
Jan 8, 2019
Merged

Update azure-go-sdk to v24.0.0 and autorest to v11.2.0 #2572

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bd472c
updated azure-go-sdk to v24.0.0, as well as grpc & protobuf
katbyte Dec 25, 2018
5ce2ce2
changes required by new SDK
katbyte Dec 25, 2018
9c4813b
update autorest to 11.2.8
katbyte Dec 26, 2018
a8741ba
remove missing vendor packages
katbyte Dec 27, 2018
5650b30
govendor fetch golang.org/x/sys/unix
katbyte Dec 27, 2018
9c7fae4
update bug template
katbyte Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion azurerm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/preview/msi/mgmt/2015-08-31-preview/msi"
"github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights"
"github.com/Azure/azure-sdk-for-go/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement"
"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/management"
"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/managementgroups"
"github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/2017-08-01-preview/security"
"github.com/Azure/azure-sdk-for-go/services/preview/signalr/mgmt/2018-03-01-preview/signalr"
"github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/data_source_management_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package azurerm
import (
"fmt"

"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/management"
"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/managementgroups"
"github.com/hashicorp/terraform/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)
Expand Down
29 changes: 11 additions & 18 deletions azurerm/resource_arm_cognitive_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,7 @@ func resourceArmCognitiveAccount() *schema.Resource {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(cognitiveservices.F0),
string(cognitiveservices.S0),
string(cognitiveservices.S1),
string(cognitiveservices.S2),
string(cognitiveservices.S3),
string(cognitiveservices.S4),
string(cognitiveservices.S5),
string(cognitiveservices.S6),
string(cognitiveservices.P0),
string(cognitiveservices.P1),
string(cognitiveservices.P2),
"F0", "S0", "S1", "S2", "S3", "S4", "S5", "S6", "P0", "P1", "P2",
}, false),
},

Expand Down Expand Up @@ -139,7 +129,7 @@ func resourceArmCognitiveAccountCreate(d *schema.ResourceData, meta interface{})
sku := expandCognitiveAccountSku(d)

properties := cognitiveservices.AccountCreateParameters{
Kind: cognitiveservices.Kind(kind),
Kind: utils.String(kind),
Location: utils.String(location),
Sku: sku,
Properties: &cognitiveServicesPropertiesStruct{},
Expand Down Expand Up @@ -258,7 +248,7 @@ func expandCognitiveAccountSku(d *schema.ResourceData) *cognitiveservices.Sku {
sku := skus[0].(map[string]interface{})

return &cognitiveservices.Sku{
Name: cognitiveservices.SkuName(sku["name"].(string)),
Name: utils.String(sku["name"].(string)),
Tier: cognitiveservices.SkuTier(sku["tier"].(string)),
}
}
Expand All @@ -268,10 +258,13 @@ func flattenCognitiveAccountSku(input *cognitiveservices.Sku) []interface{} {
return []interface{}{}
}

return []interface{}{
map[string]interface{}{
"name": string(input.Name),
"tier": string(input.Tier),
},
m := map[string]interface{}{
"tier": string(input.Tier),
}

if v := input.Name; v != nil {
m["name"] = *v
}

return []interface{}{m}
}
1 change: 0 additions & 1 deletion azurerm/resource_arm_express_route_circuit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func resourceArmExpressRouteCircuit() *schema.Resource {
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(network.Standard),
string(network.Premium),
katbyte marked this conversation as resolved.
Show resolved Hide resolved
}, true),
DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
},
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_firewall_network_rule_collection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func resourceArmFirewallNetworkRuleCollection() *schema.Resource {
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(network.Any),
"ICMP", // TODO(metacpp): update it after v22.0.
string(network.ICMP),
string(network.TCP),
string(network.UDP),
}, false),
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_management_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"strings"

"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/management"
"github.com/Azure/azure-sdk-for-go/services/preview/resources/mgmt/2018-03-01-preview/managementgroups"
"github.com/google/uuid"
"github.com/hashicorp/terraform/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
Expand Down
24 changes: 24 additions & 0 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md
View file
Open in desktop

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

201 changes: 201 additions & 0 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE
View file
Open in desktop

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

61 changes: 61 additions & 0 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/README.md
View file
Open in desktop

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

Loading