More cleanup

.gitignore

@@ -5,6 +5,7 @@ example.tf
 terraform.tfplan
 terraform.tfstate
 bin/
+dist/
 modules-dev/
 /pkg/
 website/.vagrant
@@ -29,3 +30,6 @@ website/vendor
 # Test exclusions
 !command/test-fixtures/**/*.tfstate
 !command/test-fixtures/**/.terraform/
+
+# Keep windows files with windows line endings
+*.winfile eol=crlf

rundeck/resource_project.go

@@ -200,7 +200,7 @@ func ReadProject(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	if project.StatusCode == 404 {
-		return fmt.Errorf("Project not found: (%s)", name)
+		return fmt.Errorf("project not found: (%s)", name)
 	}
 
 	projectConfig := project.Config.(map[string]interface{})
@@ -342,7 +342,7 @@ func resourceProjectImport(d *schema.ResourceData, meta interface{}) ([]*schema.
 		return nil, err
 	}
 	if !ok {
-		return nil, fmt.Errorf("Project doesn't exist. Please try again.")
+		return nil, fmt.Errorf("project doesn't exist. Please try again")
 	}
 	d.SetId(name)
 

rundeck/resource_public_key.go

@@ -3,7 +3,7 @@ package rundeck
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -56,12 +56,12 @@ func CreatePublicKey(d *schema.ResourceData, meta interface{}) error {
 	path := d.Get("path").(string)
 	keyMaterial := d.Get("key_material").(string)
 
-	keyMaterialReader := ioutil.NopCloser(strings.NewReader(keyMaterial))
+	keyMaterialReader := io.NopCloser(strings.NewReader(keyMaterial))
 
 	if keyMaterial != "" {
 		resp, err := client.StorageKeyCreate(ctx, path, keyMaterialReader, "application/pgp-keys")
 		if resp.StatusCode == 409 {
-			err = fmt.Errorf("Conflict creating key at : %s", path)
+			err = fmt.Errorf("conflict creating key at : %s", path)
 		}
 		if err != nil {
 			return err
@@ -86,7 +86,7 @@ func UpdatePublicKey(d *schema.ResourceData, meta interface{}) error {
 		path := d.Get("path").(string)
 		keyMaterial := d.Get("key_material").(string)
 
-		keyMaterialReader := ioutil.NopCloser(strings.NewReader(keyMaterial))
+		keyMaterialReader := io.NopCloser(strings.NewReader(keyMaterial))
 
 		resp, err := client.StorageKeyUpdate(ctx, path, keyMaterialReader, "application/pgp-keys")
 		if resp.StatusCode == 409 || err != nil {
@@ -133,7 +133,7 @@ func ReadPublicKey(d *schema.ResourceData, meta interface{}) error {
 
 	key, err := client.StorageKeyGetMetadata(ctx, path)
 	if key.StatusCode == 404 {
-		err = fmt.Errorf("Key not found at: %s", path)
+		err = fmt.Errorf("key not found at: %s", path)
 	}
 
 	if err != nil {
@@ -145,7 +145,7 @@ func ReadPublicKey(d *schema.ResourceData, meta interface{}) error {
 		return err
 	}
 
-	keyMaterial, err := ioutil.ReadAll(resp.Body)
+	keyMaterial, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}

rundeck/util.go

@@ -45,11 +45,11 @@ func marshalMapToXML(c *map[string]string, e *xml.Encoder, start xml.StartElemen
 		val2 := e.EncodeToken(xml.StartElement{
 			Name: xml.Name{Local: entryName},
 			Attr: []xml.Attr{
-				xml.Attr{
+				{
 					Name:  xml.Name{Local: keyName},
 					Value: k,
 				},
-				xml.Attr{
+				{
 					Name:  xml.Name{Local: valueName},
 					Value: v,
 				},