Merge pull request '#7 fail gracefully if gitea url violates RFC 2606' (#8) from feature/#7-fail-gracefully into main

Reviewed-on: #8
closes #7

Makefile

@@ -3,7 +3,7 @@ GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 
 GOFMT ?= gofmt -s
 
-VERSION = 0.6.0
+VERSION = 0.7.0
 
 test: fmt-check
 	go test -i $(TEST) || exit 1

README.md

@@ -17,7 +17,7 @@ terraform {
   required_providers {
     gitea = {
       source = "Lerentis/gitea"
-      version = "0.3.0"
+      version = "0.7.0"
     }
   }
 }

examples/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     gitea = {
       source = "terraform.local/lerentis/gitea"
-      version = "0.6.0"
+      version = "0.7.0"
     }
   }
 }

gitea/provider.go

@@ -118,5 +118,8 @@ func validateAPIURLVersion(value interface{}, key string) (ws []string, es []err
 	if strings.HasSuffix(v, "/api/v1") || strings.HasSuffix(v, "/api/v1/") {
 		es = append(es, fmt.Errorf("terraform-gitea-provider base URL format is incorrect; Please leave out API Path %s", v))
 	}
+	if strings.Contains(v, "localhost") && strings.Contains(v, ".") {
+		es = append(es, fmt.Errorf("terraform-gitea-provider base URL violates RFC 2606; Please do not define a subdomain for localhost!"))
+	}
 	return
 }

gitea/resource_gitea_public_key.go

@@ -91,9 +91,9 @@ func resourcePublicKeyDelete(d *schema.ResourceData, meta interface{}) (err erro
 func setPublicKeyResourceData(pubKey *gitea.PublicKey, d *schema.ResourceData) (err error) {
 	d.SetId(fmt.Sprintf("%d", pubKey.ID))
 	d.Set(PublicKeyUser, d.Get(PublicKeyUser).(string))
-	d.Set(PublicKey, pubKey.Key)
+	d.Set(PublicKey, d.Get(PublicKey).(string))
 	d.Set(PublicKeyTitle, pubKey.Title)
-	d.Set(PublicKeyReadOnlyFlag, pubKey.ReadOnly)
+	d.Set(PublicKeyReadOnlyFlag, d.Get(PublicKeyReadOnlyFlag).(bool))
 	d.Set(PublicKeyCreated, pubKey.Created)
 	d.Set(PublicKeyFingerprint, pubKey.Fingerprint)
 	d.Set(PublicKeyType, pubKey.KeyType)