Merge pull request #13 from rapid7/terraform_v0.12

updates for terraform 12

go.mod

@@ -0,0 +1,8 @@
+module github.com/rapid7/terraform-provider-kong
+
+go 1.12
+
+require (
+ github.com/dghubble/sling v1.2.0
+ github.com/hashicorp/terraform v0.12.6
+)

kong/resource_kong_api.go

@@ -42,11 +42,6 @@ func resourceKongAPI() *schema.Resource {
  },
 
  Schema: map[string]*schema.Schema{
- "id": &schema.Schema{
- Type: schema.TypeString,
- Computed: true,
- },
-
  "name": &schema.Schema{
  Type: schema.TypeString,
  Required: true,
@@ -166,7 +161,7 @@ func resourceKongAPICreate(d *schema.ResourceData, meta interface{}) error {
 func resourceKongAPIRead(d *schema.ResourceData, meta interface{}) error {
  sling := meta.(*sling.Sling)
 
- id := d.Get("id").(string)
+ id := d.Id()
  api := new(APIResponse)
 
  errorResponse := make(map[string]interface{})
@@ -213,7 +208,7 @@ func resourceKongAPIUpdate(d *schema.ResourceData, meta interface{}) error {
 func resourceKongAPIDelete(d *schema.ResourceData, meta interface{}) error {
  sling := meta.(*sling.Sling)
 
- id := d.Get("id").(string)
+ id := d.Id()
 
  errorResponse := make(map[string]interface{})
  response, error := sling.New().Delete("apis/").Path(id).Receive(nil, &errorResponse)
@@ -230,6 +225,7 @@ func resourceKongAPIDelete(d *schema.ResourceData, meta interface{}) error {
 
 func getAPIFromResourceData(d *schema.ResourceData) *APIRequest {
  api := &APIRequest{
+ ID: d.Id(),
  Name: d.Get("name").(string),
  Hosts: d.Get("hosts").(string),
  Uris: d.Get("uris").(string),
@@ -245,10 +241,6 @@ func getAPIFromResourceData(d *schema.ResourceData) *APIRequest {
  HTTPIfTerminated: d.Get("http_if_terminated").(bool),
  }
 
- if id, ok := d.GetOk("id"); ok {
- api.ID = id.(string)
- }
-
  return api
 }
 

kong/resource_kong_consumer.go

@@ -26,11 +26,6 @@ func resourceKongConsumer() *schema.Resource {
  },
 
  Schema: map[string]*schema.Schema{
- "id": &schema.Schema{
- Type: schema.TypeString,
- Computed: true,
- },
-
  "username": &schema.Schema{
  Type: schema.TypeString,
  Optional: true,
@@ -75,7 +70,7 @@ func resourceKongConsumerCreate(d *schema.ResourceData, meta interface{}) error
 func resourceKongConsumerRead(d *schema.ResourceData, meta interface{}) error {
  sling := meta.(*sling.Sling)
 
- id := d.Get("id").(string)
+ id := d.Id()
  consumer := new(Consumer)
 
  errorResponse := make(map[string]interface{})
@@ -121,7 +116,7 @@ func resourceKongConsumerUpdate(d *schema.ResourceData, meta interface{}) error
 func resourceKongConsumerDelete(d *schema.ResourceData, meta interface{}) error {
  sling := meta.(*sling.Sling)
 
- id := d.Get("id").(string)
+ id := d.Id()
 
  errorResponse := make(map[string]interface{})
  response, error := sling.New().Delete("consumers/").Path(id).Receive(nil, &errorResponse)
@@ -138,14 +133,11 @@ func resourceKongConsumerDelete(d *schema.ResourceData, meta interface{}) error
 
 func getConsumerFromResourceData(d *schema.ResourceData) *Consumer {
  consumer := &Consumer{
+ ID: d.Id(),
  Username: d.Get("username").(string),
  CustomID: d.Get("custom_id").(string),
  }
 
- if id, ok := d.GetOk("id"); ok {
- consumer.ID = id.(string)
- }
-
  return consumer
 }
 

kong/resource_kong_consumer_acl.go

@@ -30,12 +30,6 @@ func resourceKongConsumerACL() *schema.Resource {
  },
 
  Schema: map[string]*schema.Schema{
- "id": &schema.Schema{
- Type: schema.TypeString,
- Computed: true,
- Description: "The id of the consumer-acl association.",
- },
-
  "consumer": &schema.Schema{
  Type: schema.TypeString,
  Required: true,

kong/resource_kong_consumer_credential_basic_auth.go

@@ -30,11 +30,6 @@ func resourceKongBasicAuthCredential() *schema.Resource {
  },
 
  Schema: map[string]*schema.Schema{
- "id": &schema.Schema{
- Type: schema.TypeString,
- Computed: true,
- },
-
  "username": &schema.Schema{
  Type: schema.TypeString,
  Required: true,
@@ -151,15 +146,12 @@ func resourceKongBasicAuthCredentialDelete(d *schema.ResourceData, meta interfac
 //TODO: pasword should be SHA1 hashed to avoid differences on refresh - https://github.com/Mashape/kong/blob/master/kong/plugins/basic-auth/crypto.lua
 func getBasicAuthCredentialFromResourceData(d *schema.ResourceData) *BasicAuthCredential {
  basicAuthCredential := &BasicAuthCredential{
+ ID: d.Id(),
  Username: d.Get("username").(string),
  Password: d.Get("password").(string),
  Consumer: d.Get("consumer").(string),
  }
 
- if id, ok := d.GetOk("id"); ok {
- basicAuthCredential.ID = id.(string)
- }
-
  return basicAuthCredential
 }
 

kong/resource_kong_consumer_credential_jwt.go

@@ -29,11 +29,6 @@ func resourceKongJWTCredential() *schema.Resource {
  },
 
  Schema: map[string]*schema.Schema{
- "id": &schema.Schema{
- Type: schema.TypeString,
- Computed: true,
- },
-
  "key": &schema.Schema{
  Type: schema.TypeString,
  Optional: true,
@@ -158,17 +153,14 @@ func resourceKongJWTCredentialDelete(d *schema.ResourceData, meta interface{}) e
 
 func getJWTCredentialFromResourceData(d *schema.ResourceData) *JWTCredential {
  jwtCredential := &JWTCredential{
+ ID: d.Id(),
  Key: d.Get("key").(string),
  Algorithm: d.Get("algorithm").(string),
  RSAPublicKey: d.Get("rsa_public_key").(string),
  Secret: d.Get("secret").(string),
  Consumer: d.Get("consumer").(string),
  }
 
- if id, ok := d.GetOk("id"); ok {
- jwtCredential.ID = id.(string)
- }
-
  return jwtCredential
 }
 

kong/resource_kong_consumer_credential_key_auth.go

@@ -26,11 +26,6 @@ func resourceKongKeyAuthCredential() *schema.Resource {
  },
 
  Schema: map[string]*schema.Schema{
- "id": &schema.Schema{
- Type: schema.TypeString,
- Computed: true,
- },
-
  "key": &schema.Schema{
  Type: schema.TypeString,
  Required: true,
@@ -134,14 +129,11 @@ func resourceKongKeyAuthCredentialDelete(d *schema.ResourceData, meta interface{
 
 func getKeyAuthCredentialFromResourceData(d *schema.ResourceData) *KeyAuthCredential {
  keyAuthCredential := &KeyAuthCredential{
+ ID: d.Id(),
  Key: d.Get("key").(string),
  Consumer: d.Get("consumer").(string),
  }
 
- if id, ok := d.GetOk("id"); ok {
- keyAuthCredential.ID = id.(string)
- }
-
  return keyAuthCredential
 }
 

kong/resource_kong_key_auth_plugin.go

@@ -29,11 +29,6 @@ func resourceKongKeyAuthPlugin() *schema.Resource {
  },
 
  Schema: map[string]*schema.Schema{
- "id": &schema.Schema{
- Type: schema.TypeString,
- Computed: true,
- },
-
  "key_names": &schema.Schema{
  Type: schema.TypeString,
  Required: true,
@@ -157,17 +152,14 @@ func resourceKeyAuthPluginDelete(d *schema.ResourceData, meta interface{}) error
 
 func getKeyAuthPluginFromResourceData(d *schema.ResourceData) *KeyAuthPlugin {
  plugin := &KeyAuthPlugin{
+ ID: d.Id(),
  Name: "key-auth",
  KeyNames: d.Get("key_names").(string),
  HideCredentials: d.Get("hide_credentials").(bool),
  Anonymous: d.Get("anonymous").(string),
  API: d.Get("api").(string),
  }
 
- if id, ok := d.GetOk("id"); ok {
- plugin.ID = id.(string)
- }
-
  return plugin
 }