+ storage import s3,sftp,keys

Author: shubinmi

gcore/resource_gcore_storage_s3.go

@@ -106,6 +106,9 @@ func resourceStorageS3() *schema.Resource {
 		ReadContext:   resourceStorageS3Read,
 		DeleteContext: resourceStorageS3Delete,
 		Description:   "Represent s3 storage resource. https://storage.gcorelabs.com/storage/list",
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
 	}
 }
 
@@ -141,9 +144,6 @@ func resourceStorageS3Create(ctx context.Context, d *schema.ResourceData, m inte
 	if result.Credentials.S3.SecretKey != "" {
 		_ = d.Set(StorageS3SchemaGenerateSecretKey, result.Credentials.S3.SecretKey)
 	}
-	_ = d.Set(StorageSchemaGenerateEndpoint, fmt.Sprintf("%s.cloud.gcore.lu/%s", result.Location, result.Name))
-	_ = d.Set(StorageSchemaGenerateHTTPEndpoint, fmt.Sprintf("https://%s.cloud.gcore.lu/{bucket_name}", result.Location))
-	_ = d.Set(StorageSchemaGenerateS3Endpoint, fmt.Sprintf("https://%s.cloud.gcore.lu", result.Location))
 
 	return resourceStorageS3Read(ctx, d, m)
 }
@@ -192,6 +192,9 @@ func resourceStorageS3Read(ctx context.Context, d *schema.ResourceData, m interf
 	}
 	_ = d.Set(StorageSchemaId, st.ID)
 	_ = d.Set(StorageSchemaLocation, st.Location)
+	_ = d.Set(StorageSchemaGenerateEndpoint, fmt.Sprintf("%s.cloud.gcore.lu/%s", st.Location, st.Name))
+	_ = d.Set(StorageSchemaGenerateHTTPEndpoint, fmt.Sprintf("https://%s.cloud.gcore.lu/{bucket_name}", st.Location))
+	_ = d.Set(StorageSchemaGenerateS3Endpoint, fmt.Sprintf("https://%s.cloud.gcore.lu", st.Location))
 
 	return nil
 }

gcore/resource_gcore_storage_sftp.go

@@ -139,6 +139,9 @@ func resourceStorageSFTP() *schema.Resource {
 		UpdateContext: resourceStorageSFTPUpdate,
 		DeleteContext: resourceStorageSFTPDelete,
 		Description:   "Represent sftp storage resource. https://storage.gcorelabs.com/storage/list",
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
 	}
 }
 
@@ -277,10 +280,6 @@ func resourceStorageSFTPCreate(ctx context.Context, d *schema.ResourceData, m in
 	if result.Credentials.SftpPassword != "" {
 		_ = d.Set(StorageSFTPSchemaSftpPassword, result.Credentials.SftpPassword)
 	}
-	_ = d.Set(StorageSchemaGenerateHTTPEndpoint,
-		fmt.Sprintf("http://%s.%s.origin.gcdn.co", result.Name, result.Location))
-	_ = d.Set(StorageSchemaGenerateSFTPEndpoint,
-		fmt.Sprintf("ssh://%s@%s.origin.gcdn.co:2200", result.Name, result.Location))
 
 	err = resourceStorageLinkKeys(ctx, client, d, result.ID)
 	if err != nil {
@@ -352,6 +351,10 @@ func resourceStorageSFTPRead(ctx context.Context, d *schema.ResourceData, m inte
 	_ = d.Set(StorageSFTPSchemaExpires, st.Expires)
 	_ = d.Set(StorageSchemaId, st.ID)
 	_ = d.Set(StorageSchemaLocation, st.Location)
+	_ = d.Set(StorageSchemaGenerateHTTPEndpoint,
+		fmt.Sprintf("http://%s.%s.origin.gcdn.co", st.Name, st.Location))
+	_ = d.Set(StorageSchemaGenerateSFTPEndpoint,
+		fmt.Sprintf("ssh://%s@%s.origin.gcdn.co:2200", st.Name, st.Location))
 
 	return nil
 }

gcore/resource_gcore_storage_sftp_key.go

@@ -54,6 +54,9 @@ func resourceStorageSFTPKey() *schema.Resource {
 		ReadContext:   resourceStorageSFTPKeyRead,
 		DeleteContext: resourceStorageSFTPKeyDelete,
 		Description:   "Represent storage key resource. https://storage.gcorelabs.com/ssh-key/list",
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
 	}
 }