Image: add basic auth support to download source image

openstack/images_image_v2.go

@@ -82,7 +82,7 @@ func resourceImagesImageV2FileProps(filename string) (int64, string, error) {
 	return filesize, filechecksum, nil
 }
 
-func resourceImagesImageV2File(d *schema.ResourceData) (string, error) {
+func resourceImagesImageV2File(client *gophercloud.ServiceClient, d *schema.ResourceData) (string, error) {
 	if filename := d.Get("local_file_path").(string); filename != "" {
 		return filename, nil
 	} else if furl := d.Get("image_source_url").(string); furl != "" {
@@ -100,10 +100,28 @@ func resourceImagesImageV2File(d *schema.ResourceData) (string, error) {
 				return "", fmt.Errorf("Error creating file %q: %s", filename, err)
 			}
 			defer file.Close()
-			resp, err := http.Get(furl)
+			client := &client.ProviderClient.HTTPClient
+			request, err := http.NewRequest("GET", furl, nil)
+			if err != nil {
+				return "", fmt.Errorf("Error create a new request")
+			}
+
+			username := d.Get("image_source_username").(string)
+			password := d.Get("image_source_password").(string)
+			if username != "" && password != "" {
+				request.SetBasicAuth(username, password)
+			}
+
+			resp, err := client.Do(request)
 			if err != nil {
 				return "", fmt.Errorf("Error downloading image from %q", furl)
 			}
+
+			// check for credential error among other errors
+			if resp.StatusCode != http.StatusOK {
+				return "", fmt.Errorf("Error downloading image from %q, statusCode is %d", furl, resp.StatusCode)
+			}
+
 			defer resp.Body.Close()
 
 			if _, err = io.Copy(file, resp.Body); err != nil {

openstack/resource_openstack_images_image_v2.go

@@ -84,6 +84,19 @@ func resourceImagesImageV2() *schema.Resource {
 				ConflictsWith: []string{"local_file_path"},
 			},
 
+			"image_source_username": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				ConflictsWith: []string{"local_file_path"},
+			},
+
+			"image_source_password": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Sensitive:     true,
+				ConflictsWith: []string{"local_file_path"},
+			},
+
 			"local_file_path": {
 				Type:          schema.TypeString,
 				Optional:      true,
@@ -257,7 +270,7 @@ func resourceImagesImageV2Create(d *schema.ResourceData, meta interface{}) error
 		var imgFile *os.File
 
 		// downloading/getting image file props
-		imgFilePath, err = resourceImagesImageV2File(d)
+		imgFilePath, err = resourceImagesImageV2File(imageClient, d)
 		if err != nil {
 			return fmt.Errorf("Error opening file for Image: %s", err)
 		}

website/docs/r/images_image_v2.html.markdown

@@ -10,6 +10,10 @@ description: |-
 
 Manages a V2 Image resource within OpenStack Glance.
 
+~> **Note:** All arguments including the source image URL password will be
+stored in the raw state as plain-text. [Read more about sensitive data in
+state](https://www.terraform.io/docs/language/state/sensitive-data.html).
+
 ## Example Usage
 
 ```hcl
@@ -48,6 +52,10 @@ The following arguments are supported:
    being uploaded to Glance.
    Conflicts with `local_file_path`.
 
+* `image_source_username` - (Optional) The username of basic auth to download `image_source_url`.
+
+* `image_source_password` - (Optional) The password of basic auth to download `image_source_url`.
+
 * `min_disk_gb` - (Optional) Amount of disk space (in GB) required to boot image.
    Defaults to 0.