fixing more url stuff

kubernetes · Oct 20, 2017 · 3de15b2 · 3de15b2
1 parent a72ad4c
commit 3de15b2
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go
@@ -216,7 +216,7 @@ func (c *ApplyClusterCmd) Run() error {
 	}
 
 	if err := c.applyFileAssets(assetBuilder); err != nil {
-		return err
+		return fmt.Errorf("error getting assets: %v", err)
 	}
 
 	checkExisting := true
@@ -938,18 +938,12 @@ func (c *ApplyClusterCmd) applyFileAssets(assetBuilder *assets.AssetBuilder) err
 		c.Cluster.Spec.KubernetesVersion = versionWithoutV
 	}
 
-	var baseURL *url.URL
+	var baseURL string
 	var err error
 	if components.IsBaseURL(c.Cluster.Spec.KubernetesVersion) {
-		baseURL, err = url.Parse(c.Cluster.Spec.KubernetesVersion)
-		if err != nil {
-			return err
-		}
+		baseURL = c.Cluster.Spec.KubernetesVersion
 	} else {
-		baseURL, err = url.Parse("https://storage.googleapis.com/kubernetes-release/release/v" + c.Cluster.Spec.KubernetesVersion)
-		if err != nil {
-			return err
-		}
+		baseURL = "https://storage.googleapis.com/kubernetes-release/release/v" + c.Cluster.Spec.KubernetesVersion
 	}
 
 	k8sAssetsNames := []string{
@@ -961,8 +955,12 @@ func (c *ApplyClusterCmd) applyFileAssets(assetBuilder *assets.AssetBuilder) err
 	}
 
 	for _, a := range k8sAssetsNames {
-		k := &url.URL { }
-		k.Path = path.Join(baseURL.Path, a)
+		// TODO how do I parse this URL once?
+		k, err := url.Parse(baseURL)
+		if err != nil {
+			return err
+		}
+		k.Path = path.Join(k.Path, a)
 		u := k.String()
 		sha := fmt.Sprintf("%s.sha", u)