From 275d4682aff5cf382e6ac39fd5e480e8b608d27e Mon Sep 17 00:00:00 2001 From: Arnvid Lau Karstad Date: Sun, 3 May 2020 04:05:33 +0200 Subject: [PATCH] terraform-provider-appstream - compiles --- appstream/config.go | 12 +++++------- appstream/provider.go | 6 +++--- appstream/resource_fleet.go | 6 +++--- appstream/resource_image_builder.go | 6 +++--- appstream/resource_stack.go | 5 ++--- go.mod | 3 ++- main.go | 1 - 7 files changed, 18 insertions(+), 21 deletions(-) diff --git a/appstream/config.go b/appstream/config.go index 7c173ed..3aba457 100644 --- a/appstream/config.go +++ b/appstream/config.go @@ -1,15 +1,14 @@ package appstream import ( - "fmt" - "log" - "strings" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/endpoints" "github.com/aws/aws-sdk-go/service/appstream" "github.com/aws/aws-sdk-go/service/imagebuilder" awsbase "github.com/hashicorp/aws-sdk-go-base" "github.com/hashicorp/terraform-plugin-sdk/helper/logging" + "fmt" + "log" ) @@ -31,9 +30,8 @@ type Config struct { ForbiddenAccountIds []string Endpoints map[string]string - IgnoreTagsConfig []string - IgnoreTagPrefixes []string - IgnoreTags []string + IgnoreTagPrefixes []string + IgnoreTags []string Insecure bool SkipCredsValidation bool @@ -133,4 +131,4 @@ func (c *Config) Client() (interface{}, error) { terraformVersion: c.terraformVersion, } return client, nil -} \ No newline at end of file +} diff --git a/appstream/provider.go b/appstream/provider.go index 4a6b575..7ea1f60 100644 --- a/appstream/provider.go +++ b/appstream/provider.go @@ -1,10 +1,10 @@ package appstream import ( - "log" - "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" homedir "github.com/mitchellh/go-homedir" + "log" ) func Provider() terraform.ResourceProvider { @@ -211,4 +211,4 @@ func assumeRoleSchema() *schema.Schema { }, }, } -} \ No newline at end of file +} diff --git a/appstream/resource_fleet.go b/appstream/resource_fleet.go index 0a65b72..7119e92 100644 --- a/appstream/resource_fleet.go +++ b/appstream/resource_fleet.go @@ -1,12 +1,12 @@ package appstream import ( + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appstream" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "log" "strings" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appstream" ) diff --git a/appstream/resource_image_builder.go b/appstream/resource_image_builder.go index e18a23a..beec924 100644 --- a/appstream/resource_image_builder.go +++ b/appstream/resource_image_builder.go @@ -1,12 +1,12 @@ package appstream import ( + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appstream" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "log" "strings" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appstream" ) diff --git a/appstream/resource_stack.go b/appstream/resource_stack.go index d0bc903..73d86d6 100644 --- a/appstream/resource_stack.go +++ b/appstream/resource_stack.go @@ -1,12 +1,11 @@ package appstream import ( - "log" - "time" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/appstream" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "log" + "time" ) func resourceAppstreamStack() *schema.Resource { diff --git a/go.mod b/go.mod index b2a29c1..131e574 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,11 @@ module github.com/arnvid/terraform-provider-appstream -go 1.13 +go 1.14 require ( github.com/aws/aws-sdk-go v1.30.19 github.com/hashicorp/aws-sdk-go-base v0.4.0 github.com/hashicorp/terraform v0.12.24 github.com/hashicorp/terraform-plugin-sdk v1.11.0 + github.com/mitchellh/go-homedir v1.1.0 ) diff --git a/main.go b/main.go index 8b21e00..2c71977 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,6 @@ package main import ( "github.com/hashicorp/terraform-plugin-sdk/plugin" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/arnvid/terraform-provider-appstream/appstream" )