Skip to content

Commit

Permalink
Fix PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
titilambert committed Jun 6, 2019
1 parent 90e6b82 commit 8cf7c31
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 5,943 deletions.
9 changes: 5 additions & 4 deletions azurerm/data_source_kubernetes_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -641,12 +641,13 @@ func flattenKubernetesClusterDataSourceLinuxProfile(input *containerservice.Linu
}

func flattenKubernetesClusterDataSourceWindowsProfile(input *containerservice.ManagedClusterWindowsProfile) []interface{} {
if input == nil {
return []interface{}{}
}
values := make(map[string]interface{})

if profile := input; profile != nil {
if username := profile.AdminUsername; username != nil {
values["admin_username"] = *username
}
if username := input.AdminUsername; username != nil {
values["admin_username"] = *username
}

return []interface{}{values}
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/containers/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package containers
import (
"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance"
"github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry"
"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2019-02-01/containerservice"
"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2019-04-30/containerservice"
)

type Client struct {
Expand Down
1 change: 1 addition & 0 deletions azurerm/resource_arm_kubernetes_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ func resourceArmKubernetesCluster() *schema.Resource {
"admin_password": {
Type: schema.TypeString,
Optional: true,
Sensitive: true,
ValidateFunc: validate.NoEmptyStrings,
},
},
Expand Down
Loading

0 comments on commit 8cf7c31

Please sign in to comment.