Get rid of tagging

Author: Manuel Valls Fernández

aws/config.go

@@ -10,7 +10,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	awsbase "github.com/hashicorp/aws-sdk-go-base"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
-	"github.com/manvalls/terraform-provider-wasabi/aws/internal/keyvaluetags"
 )
 
 type Config struct {
@@ -28,15 +27,13 @@ type Config struct {
 	AssumeRolePolicy            string
 	AssumeRolePolicyARNs        []string
 	AssumeRoleSessionName       string
-	AssumeRoleTags              map[string]string
 	AssumeRoleTransitiveTagKeys []string
 
 	AllowedAccountIds   []string
 	ForbiddenAccountIds []string
 
-	Endpoints        map[string]string
-	IgnoreTagsConfig *keyvaluetags.IgnoreConfig
-	Insecure         bool
+	Endpoints map[string]string
+	Insecure  bool
 
 	SkipCredsValidation     bool
 	SkipRequestingAccountId bool
@@ -50,7 +47,6 @@ type AWSClient struct {
 	accountid                 string
 	dnsSuffix                 string
 	iamconn                   *iam.IAM
-	IgnoreTagsConfig          *keyvaluetags.IgnoreConfig
 	partition                 string
 	region                    string
 	s3conn                    *s3.S3
@@ -83,7 +79,6 @@ func (c *Config) Client() (interface{}, error) {
 		AssumeRolePolicy:            c.AssumeRolePolicy,
 		AssumeRolePolicyARNs:        c.AssumeRolePolicyARNs,
 		AssumeRoleSessionName:       c.AssumeRoleSessionName,
-		AssumeRoleTags:              c.AssumeRoleTags,
 		AssumeRoleTransitiveTagKeys: c.AssumeRoleTransitiveTagKeys,
 		CallerDocumentationURL:      "https://registry.terraform.io/providers/hashicorp/aws",
 		CallerName:                  "Terraform AWS Provider",

aws/data_source_aws_iam_role.go

@@ -5,8 +5,6 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/manvalls/terraform-provider-wasabi/aws/internal/keyvaluetags"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -53,14 +51,12 @@ func dataSourceAwsIAMRole() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
-			"tags": tagsSchemaComputed(),
 		},
 	}
 }
 
 func dataSourceAwsIAMRoleRead(d *schema.ResourceData, meta interface{}) error {
 	iamconn := meta.(*AWSClient).iamconn
-	ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig
 
 	name := d.Get("name").(string)
 
@@ -86,7 +82,6 @@ func dataSourceAwsIAMRoleRead(d *schema.ResourceData, meta interface{}) error {
 		d.Set("permissions_boundary", output.Role.PermissionsBoundary.PermissionsBoundaryArn)
 	}
 	d.Set("unique_id", output.Role.RoleId)
-	d.Set("tags", keyvaluetags.IamKeyValueTags(output.Role.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map())
 
 	assumRolePolicy, err := url.QueryUnescape(aws.StringValue(output.Role.AssumeRolePolicyDocument))
 	if err != nil {

aws/data_source_aws_s3_bucket_object.go

@@ -11,7 +11,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/manvalls/terraform-provider-wasabi/aws/internal/keyvaluetags"
 )
 
 func dataSourceAwsS3BucketObject() *schema.Resource {
@@ -113,15 +112,12 @@ func dataSourceAwsS3BucketObject() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-
-			"tags": tagsSchemaComputed(),
 		},
 	}
 }
 
 func dataSourceAwsS3BucketObjectRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).s3conn
-	ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig
 
 	bucket := d.Get("bucket").(string)
 	key := d.Get("key").(string)
@@ -221,16 +217,6 @@ func dataSourceAwsS3BucketObjectRead(d *schema.ResourceData, meta interface{}) e
 			uniqueId, contentType)
 	}
 
-	tags, err := keyvaluetags.S3ObjectListTags(conn, bucket, key)
-
-	if err != nil {
-		return fmt.Errorf("error listing tags for S3 Bucket (%s) Object (%s): %s", bucket, key, err)
-	}
-
-	if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
-		return fmt.Errorf("error setting tags: %s", err)
-	}
-
 	return nil
 }