V0.9.1 dev (#12)

* Introduce a new paramter to configure the seconds to wait after the initial creation of a Shared Drive (resolves #11) * Update year * Mention support for Drive Labels in README
hanneshayashi · Feb 5, 2023 · e9b2369 · e9b2369
1 parent 65cb3ac
commit e9b2369
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ A Terraform Provider for Google Drive
 * Manage Shared Drives and organize them into organizational units
 * Manage Google Drive files (including file uploads, downloads and exports)
 * Manage Google Drive permissions
+* Manage Google Drive Labels (assignment to files als folders)
 
 ## Installation
 To install this provider, copy and paste this code into your Terraform configuration. Then, run terraform init.

diff --git a/docs/resources/drive.md b/docs/resources/drive.md
@@ -43,6 +43,9 @@ resource "gdrive_drive" "drive_restrictions" {
 
 - `restrictions` (Block List, Max: 1) The restrictions that should be set on the Shared Drive (see [below for nested schema](#nestedblock--restrictions))
 - `use_domain_admin_access` (Boolean) Use domain admin access
+- `wait_after_create` (Number) The Drive API returns a Shared Drive object immediately after creation, even though it is often not ready or visibile in other APIS.
+In order to prevent 404 errors after the creation of a Shared Drive, the provider will wait the specified number of seconds after the creation of a Shared Drive and before returning or attempting further operations.
+This value is only used for the initial creation and not used for updates. Changing this value after the initial creation has no effect.
 
 ### Read-Only
 

diff --git a/main.go b/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/data_source_drive.go b/provider/data_source_drive.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/data_source_drives.go b/provider/data_source_drives.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/data_source_file.go b/provider/data_source_file.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/data_source_files.go b/provider/data_source_files.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/data_source_label.go b/provider/data_source_label.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/data_source_labels.go b/provider/data_source_labels.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/data_source_permission.go b/provider/data_source_permission.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/data_source_permissions.go b/provider/data_source_permissions.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/helpers.go b/provider/helpers.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/provider.go b/provider/provider.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/resource_drive.go b/provider/resource_drive.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -39,6 +39,14 @@ func resourceDrive() *schema.Resource {
 				Optional:    true,
 				Description: "Use domain admin access",
 			},
+			"wait_after_create": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Default:  60,
+				Description: `The Drive API returns a Shared Drive object immediately after creation, even though it is often not ready or visibile in other APIS.
+In order to prevent 404 errors after the creation of a Shared Drive, the provider will wait the specified number of seconds after the creation of a Shared Drive and before returning or attempting further operations.
+This value is only used for the initial creation and not used for updates. Changing this value after the initial creation has no effect.`,
+			},
 			"restrictions": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -146,8 +154,11 @@ func resourceCreateDrive(d *schema.ResourceData, _ any) error {
 		return err
 	}
 	d.SetId(driveResult.Id)
-	time.Sleep(5 * time.Second)
-	return resourceUpdateDrive(d, nil)
+	time.Sleep(time.Duration(d.Get("wait_after_create").(int)) * time.Second)
+	if d.HasChange("restrictions") {
+		return resourceUpdateDrive(d, nil)
+	}
+	return resourceReadDrive(d, nil)
 }
 
 func resourceReadDrive(d *schema.ResourceData, _ any) error {
@@ -177,11 +188,7 @@ func resourceUpdateDrive(d *schema.ResourceData, _ any) error {
 	if err != nil {
 		return err
 	}
-	err = resourceReadDrive(d, nil)
-	if err != nil {
-		return err
-	}
-	return nil
+	return resourceReadDrive(d, nil)
 }
 
 func resourceDeleteDrive(d *schema.ResourceData, _ any) error {

diff --git a/provider/resource_driveoumembership.go b/provider/resource_driveoumembership.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/resource_file.go b/provider/resource_file.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/resource_label_assignment.go b/provider/resource_label_assignment.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/resource_label_policy.go b/provider/resource_label_policy.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/resource_permission.go b/provider/resource_permission.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/provider/resource_permissions_policy.go b/provider/resource_permissions_policy.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2021-2022 Hannes Hayashi
+Copyright © 2021-2023 Hannes Hayashi
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by