Skip to content

Commit 0411f9d

Browse files
Monitobremyleone
andauthored
feat(registry): add waiting process to registry namespace (#1128)
Co-authored-by: Rémy Léone <[email protected]>
1 parent 83f6265 commit 0411f9d

3 files changed

+405
-246
lines changed

scaleway/resource_registry_namespace.go

+27-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func resourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.Resour
7979
return diag.FromErr(err)
8080
}
8181

82-
ns, err := api.GetNamespace(&registry.GetNamespaceRequest{
82+
ns, err := api.WaitForNamespace(&registry.WaitForNamespaceRequest{
8383
Region: region,
8484
NamespaceID: id,
8585
}, scw.WithContext(ctx))
@@ -109,6 +109,19 @@ func resourceScalewayRegistryNamespaceUpdate(ctx context.Context, d *schema.Reso
109109
return diag.FromErr(err)
110110
}
111111

112+
_, err = api.WaitForNamespace(&registry.WaitForNamespaceRequest{
113+
Region: region,
114+
NamespaceID: id,
115+
}, scw.WithContext(ctx))
116+
117+
if err != nil {
118+
if is404Error(err) {
119+
d.SetId("")
120+
return nil
121+
}
122+
return diag.FromErr(err)
123+
}
124+
112125
if d.HasChanges("description", "is_public") {
113126
if _, err := api.UpdateNamespace(&registry.UpdateNamespaceRequest{
114127
Region: region,
@@ -129,6 +142,19 @@ func resourceScalewayRegistryNamespaceDelete(ctx context.Context, d *schema.Reso
129142
return diag.FromErr(err)
130143
}
131144

145+
_, err = api.WaitForNamespace(&registry.WaitForNamespaceRequest{
146+
Region: region,
147+
NamespaceID: id,
148+
}, scw.WithContext(ctx))
149+
150+
if err != nil {
151+
if is404Error(err) {
152+
d.SetId("")
153+
return nil
154+
}
155+
return diag.FromErr(err)
156+
}
157+
132158
_, err = api.DeleteNamespace(&registry.DeleteNamespaceRequest{
133159
Region: region,
134160
NamespaceID: id,

0 commit comments

Comments
 (0)