codereview changes

hashicorp · Nov 15, 2018 · cbb4fb1 · cbb4fb1
1 parent 8b5965a
commit cbb4fb1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/azurerm/helpers/kubernetes/kube_config.go b/azurerm/helpers/kubernetes/kube_config.go
@@ -108,8 +108,7 @@ func ParseKubeConfigAAD(config string) (*KubeConfigAAD, error) {
 	}
 
 	var kubeConfig KubeConfigAAD
-	err := yaml.Unmarshal([]byte(config), &kubeConfig)
-	if err != nil {
+	if err := yaml.Unmarshal([]byte(config), &kubeConfig); err != nil {
 		return nil, fmt.Errorf("Failed to unmarshal YAML config with error %+v", err)
 	}
 	if len(kubeConfig.Clusters) <= 0 || len(kubeConfig.Users) <= 0 {

diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go
@@ -475,8 +475,7 @@ func resourceArmKubernetesClusterCreateUpdate(d *schema.ResourceData, meta inter
 		return fmt.Errorf("Error creating/updating Managed Kubernetes Cluster %q (Resource Group %q): %+v", name, resGroup, err)
 	}
 
-	err = future.WaitForCompletionRef(ctx, client.Client)
-	if err != nil {
+	if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
 		return fmt.Errorf("Error waiting for completion of Managed Kubernetes Cluster %q (Resource Group %q): %+v", name, resGroup, err)
 	}
 
@@ -712,7 +711,6 @@ func flattenKubernetesClusterAddonProfiles(profile map[string]*containerservice.
 func expandKubernetesClusterAgentPoolProfiles(d *schema.ResourceData) []containerservice.ManagedClusterAgentPoolProfile {
 	configs := d.Get("agent_pool_profile").([]interface{})
 	config := configs[0].(map[string]interface{})
-	profiles := make([]containerservice.ManagedClusterAgentPoolProfile, 0, len(configs))
 
 	name := config["name"].(string)
 	count := int32(config["count"].(int))
@@ -738,9 +736,7 @@ func expandKubernetesClusterAgentPoolProfiles(d *schema.ResourceData) []containe
 		profile.VnetSubnetID = utils.String(vnetSubnetID)
 	}
 
-	profiles = append(profiles, profile)
-
-	return profiles
+	return []containerservice.ManagedClusterAgentPoolProfile{profile}
 }
 
 func flattenKubernetesClusterAgentPoolProfiles(profiles *[]containerservice.ManagedClusterAgentPoolProfile, fqdn *string) []interface{} {

diff --git a/examples/kubernetes/advanced-networking/variables.tf b/examples/kubernetes/advanced-networking/variables.tf
@@ -1,5 +1,6 @@
 variable "prefix" {
   description = "A prefix used for all resources in this example"
+  default = "tomdev"
 }
 
 variable "location" {

diff --git a/examples/kubernetes/basic/variables.tf b/examples/kubernetes/basic/variables.tf
@@ -1,5 +1,6 @@
 variable "prefix" {
   description = "A prefix used for all resources in this example"
+  default     = "tomdev"
 }
 
 variable "location" {

diff --git a/website/docs/d/kubernetes_cluster.html.markdown b/website/docs/d/kubernetes_cluster.html.markdown
@@ -80,7 +80,7 @@ A `agent_pool_profile` block exports the following:
 
 * `max_pods` - The maximum number of pods that can run on each agent.
 
-* `name` - The name assigned to this pool of agents
+* `name` - The name assigned to this pool of agents.
 
 * `os_disk_size_gb` - The size of the Agent VM's Operating System Disk in GB.
 

diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown
@@ -73,7 +73,7 @@ The following arguments are supported:
   the `ARM_CLIENT_SECRET` environment variable.
 
 * `tenant_id` - (Optional) The tenant ID to use. It can also be sourced from the
-  `ARM_TENANT_ID` environment variable.`
+  `ARM_TENANT_ID` environment variable.
 
 * `use_msi` - (Optional) Set to true to authenticate using managed service identity.
   It can also be sourced from the `ARM_USE_MSI` environment variable.