Skip to content

chore(registry): add support for context workflow #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2020
Merged

chore(registry): add support for context workflow #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6795f6
chore(registry): add support for context workflow
remyleone Oct 12, 2020
fd8e115
Merge branch 'master' into context_registry
remyleone Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions scaleway/data_source_registry_namespace_beta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package scaleway

import (
"context"
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)

func dataSourceScalewayRegistryNamespaceBeta() *schema.Resource {
Expand All @@ -23,32 +26,32 @@ func dataSourceScalewayRegistryNamespaceBeta() *schema.Resource {
}

return &schema.Resource{
Read: dataSourceScalewayRegistryNamespaceReadBeta,
ReadContext: dataSourceScalewayRegistryNamespaceReadBeta,

Schema: dsSchema,
}
}

func dataSourceScalewayRegistryNamespaceReadBeta(d *schema.ResourceData, m interface{}) error {
func dataSourceScalewayRegistryNamespaceReadBeta(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
api, region, err := registryAPIWithRegion(d, m)
if err != nil {
return err
return diag.FromErr(err)
}

namespaceID, ok := d.GetOk("namespace_id")
if !ok {
res, err := api.ListNamespaces(&registry.ListNamespacesRequest{
Region: region,
Name: expandStringPtr(d.Get("name")),
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}
if len(res.Namespaces) == 0 {
return fmt.Errorf("no namespaces found with the name %s", d.Get("name"))
return diag.FromErr(fmt.Errorf("no namespaces found with the name %s", d.Get("name")))
}
if len(res.Namespaces) > 1 {
return fmt.Errorf("%d namespaces found with the same name %s", len(res.Namespaces), d.Get("name"))
return diag.FromErr(fmt.Errorf("%d namespaces found with the same name %s", len(res.Namespaces), d.Get("name")))
}
namespaceID = res.Namespaces[0].ID
}
Expand All @@ -57,5 +60,5 @@ func dataSourceScalewayRegistryNamespaceReadBeta(d *schema.ResourceData, m inter
d.SetId(regionalID)
_ = d.Set("namespace_id", regionalID)

return resourceScalewayRegistryNamespaceBetaRead(d, m)
return resourceScalewayRegistryNamespaceBetaRead(ctx, d, m)
}
49 changes: 26 additions & 23 deletions scaleway/resource_registry_namespace_beta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
package scaleway

import (
"context"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)

func resourceScalewayRegistryNamespaceBeta() *schema.Resource {
return &schema.Resource{
Create: resourceScalewayRegistryNamespaceBetaCreate,
Read: resourceScalewayRegistryNamespaceBetaRead,
Update: resourceScalewayRegistryNamespaceBetaUpdate,
Delete: resourceScalewayRegistryNamespaceBetaDelete,
CreateContext: resourceScalewayRegistryNamespaceBetaCreate,
ReadContext: resourceScalewayRegistryNamespaceBetaRead,
UpdateContext: resourceScalewayRegistryNamespaceBetaUpdate,
DeleteContext: resourceScalewayRegistryNamespaceBetaDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
StateContext: schema.ImportStatePassthroughContext,
},
SchemaVersion: 0,
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -44,10 +47,10 @@ func resourceScalewayRegistryNamespaceBeta() *schema.Resource {
}
}

func resourceScalewayRegistryNamespaceBetaCreate(d *schema.ResourceData, m interface{}) error {
func resourceScalewayRegistryNamespaceBetaCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
api, region, err := registryAPIWithRegion(d, m)
if err != nil {
return err
return diag.FromErr(err)
}

ns, err := api.CreateNamespace(&registry.CreateNamespaceRequest{
Expand All @@ -56,33 +59,33 @@ func resourceScalewayRegistryNamespaceBetaCreate(d *schema.ResourceData, m inter
Name: d.Get("name").(string),
Description: d.Get("description").(string),
IsPublic: d.Get("is_public").(bool),
})
}, scw.WithContext(ctx))
if err != nil {
return err
return diag.FromErr(err)
}

d.SetId(newRegionalIDString(region, ns.ID))

return resourceScalewayRegistryNamespaceBetaRead(d, m)
return resourceScalewayRegistryNamespaceBetaRead(ctx, d, m)
}

func resourceScalewayRegistryNamespaceBetaRead(d *schema.ResourceData, m interface{}) error {
func resourceScalewayRegistryNamespaceBetaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
api, region, id, err := registryAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

ns, err := api.GetNamespace(&registry.GetNamespaceRequest{
Region: region,
NamespaceID: id,
})
}, scw.WithContext(ctx))

if err != nil {
if is404Error(err) {
d.SetId("")
return nil
}
return err
return diag.FromErr(err)
}

_ = d.Set("name", ns.Name)
Expand All @@ -95,10 +98,10 @@ func resourceScalewayRegistryNamespaceBetaRead(d *schema.ResourceData, m interfa
return nil
}

func resourceScalewayRegistryNamespaceBetaUpdate(d *schema.ResourceData, m interface{}) error {
func resourceScalewayRegistryNamespaceBetaUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
api, region, id, err := registryAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

if d.HasChange("description") || d.HasChange("is_public") {
Expand All @@ -107,27 +110,27 @@ func resourceScalewayRegistryNamespaceBetaUpdate(d *schema.ResourceData, m inter
NamespaceID: id,
Description: expandStringPtr(d.Get("description")),
IsPublic: scw.BoolPtr(d.Get("is_public").(bool)),
}); err != nil {
return err
}, scw.WithContext(ctx)); err != nil {
return diag.FromErr(err)
}
}

return resourceScalewayRegistryNamespaceBetaRead(d, m)
return resourceScalewayRegistryNamespaceBetaRead(ctx, d, m)
}

func resourceScalewayRegistryNamespaceBetaDelete(d *schema.ResourceData, m interface{}) error {
func resourceScalewayRegistryNamespaceBetaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
api, region, id, err := registryAPIWithRegionAndID(m, d.Id())
if err != nil {
return err
return diag.FromErr(err)
}

_, err = api.DeleteNamespace(&registry.DeleteNamespaceRequest{
Region: region,
NamespaceID: id,
})
}, scw.WithContext(ctx))

if err != nil && !is404Error(err) {
return err
return diag.FromErr(err)
}

return nil
Expand Down