Skip to content
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

Make cloudflare_access_rule importable for all rule types #141

Merged
merged 1 commit into from
Oct 26, 2018
Merged

Make cloudflare_access_rule importable for all rule types #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 33 additions & 2 deletions cloudflare/resource_cloudflare_access_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func resourceCloudflareAccessRule() *schema.Resource {
Update: resourceCloudflareAccessRuleUpdate,
Delete: resourceCloudflareAccessRuleDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
State: resourceCloudflareAccessRuleImport,
},

Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -133,6 +133,7 @@ func resourceCloudflareAccessRuleRead(d *schema.ResourceData, meta interface{})
if client.OrganizationID != "" {
accessRuleResponse, err = client.OrganizationAccessRule(client.OrganizationID, d.Id())
} else {

accessRuleResponse, err = client.UserAccessRule(d.Id())
}
} else {
Expand All @@ -144,7 +145,7 @@ func resourceCloudflareAccessRuleRead(d *schema.ResourceData, meta interface{})

if err != nil {
if strings.Contains(err.Error(), "HTTP status 404") {
log.Printf("[INFO] Page Rule %s no longer exists", d.Id())
log.Printf("[INFO] Access Rule %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down Expand Up @@ -229,6 +230,36 @@ func resourceCloudflareAccessRuleDelete(d *schema.ResourceData, meta interface{}
return nil
}

func resourceCloudflareAccessRuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
client := meta.(*cloudflare.API)
attributes := strings.Split(d.Id(), "/")

var (
accessRuleType string
accessRuleTypeIdentifier string
accessRuleID string
)

if len(attributes) != 3 {
return nil, fmt.Errorf("invalid id (\"%s\") specified, should be in format \"accessRuleType/accessRuleTypeIdentifier/identiferValue\"", d.Id())
}

accessRuleType, accessRuleTypeIdentifier, accessRuleID = attributes[0], attributes[1], attributes[2]

d.SetId(accessRuleID)

switch accessRuleType {
case "account":
client.OrganizationID = accessRuleTypeIdentifier
case "zone":
d.Set("zone_id", accessRuleTypeIdentifier)
}

resourceCloudflareAccessRuleRead(d, meta)

return []*schema.ResourceData{d}, nil
}

func configurationDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
switch {
case d.Get("configuration.target") == "country" &&
Expand Down
11 changes: 8 additions & 3 deletions website/docs/r/access_rule.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,17 @@ The following attributes are exported:

## Import

Records can be imported using a composite ID formed of zone name and record ID, e.g.
Records can be imported using a composite ID formed of access rule type,
access rule type identifier and identifer value, e.g.

```
$ terraform import cloudflare_access_rule.default d41d8cd98f00b204e9800998ecf8427e
$ terraform import cloudflare_access_rule.default zone/cb029e245cfdd66dc8d2e570d5dd3322/d41d8cd98f00b204e9800998ecf8427e
```

where:

* `d41d8cd98f00b204e9800998ecf8427e` - access rule ID as returned by [API](https://api.cloudflare.com/#user-level-firewall-access-rule-list-access-rules)
* `zone` - access rule type (`account`, `zone` or `user`)
* `cb029e245cfdd66dc8d2e570d5dd3322` - access rule type ID (i.e the zone ID
or account ID you wish to target)
* `d41d8cd98f00b204e9800998ecf8427e` - access rule ID as returned by
respective API endpoint for the type you are attempting to import.