Merge pull request #8 from ruedigerp/develop

Develop
ruedigerp · Nov 22, 2024 · fea54dc · fea54dc
2 parents 78536a9 + 8580514
commit fea54dc
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,6 @@
-# readme
+# DNS-Manager 
+
+## Install 
+
+    brew tap ruedigerp/dns-manager
+    brew install ruedigerp/dns-manager
diff --git a/cmd/addRecord.go b/cmd/addRecord.go
@@ -20,6 +20,7 @@ var addRecordCmd = &cobra.Command{
 		proxied, _ := cmd.Flags().GetBool("proxied")
 		zone, _ := cmd.Flags().GetString("zone")
 		serviceprovider, _ := cmd.Flags().GetString("serviceprovider")
+		comment, _ := cmd.Flags().GetString("comment")
 
 		if dnsapi.CheckEmpty(ip, "ip address", "-i|--ip 123.123.123.123") ||
 			dnsapi.CheckEmpty(domain, "domain", "-d|--domain test.domain.tld") {
@@ -44,7 +45,7 @@ var addRecordCmd = &cobra.Command{
 
 			} else {
 
-				dnsapi.AddRecord(zoneID, token, domain, rtype, ip, proxied)
+				dnsapi.AddRecord(zoneID, token, domain, rtype, ip, proxied, comment)
 
 				resp, recordID, err := dnsapi.GetRecordId(zoneID, token, domain)
 				if resp {

diff --git a/cmd/batch.go b/cmd/batch.go
@@ -33,7 +33,7 @@ var batchCmd = &cobra.Command{
 
 				if dnsconfig.Batch.Provider == "cloudflare" {
 
-					dnsapi.AddRecord(zoneID, token, domain, dnsconfig.Batch.Rtype, dnsconfig.Batch.IP, dnsconfig.Batch.Proxied)
+					dnsapi.AddRecord(zoneID, token, domain, dnsconfig.Batch.Rtype, dnsconfig.Batch.IP, dnsconfig.Batch.Proxied, dnsconfig.Batch.Comment)
 
 				} else if dnsconfig.Batch.Provider == "bind" {
 
@@ -64,7 +64,7 @@ var batchCmd = &cobra.Command{
 
 				if dnsconfig.Batch.Provider == "cloudflare" {
 
-					dnsapi.UpdateRecord(zoneID, token, domain, dnsconfig.Batch.Rtype, dnsconfig.Batch.IP, dnsconfig.Batch.Proxied)
+					dnsapi.UpdateRecord(zoneID, token, domain, dnsconfig.Batch.Rtype, dnsconfig.Batch.IP, dnsconfig.Batch.Proxied, dnsconfig.Batch.Comment)
 
 				} else if dnsconfig.Batch.Provider == "bind" {
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -62,5 +62,6 @@ func init() {
 	rootCmd.PersistentFlags().BoolP("proxied", "p", false, "Record type (A,TXT,CNAME, ...)")
 	rootCmd.PersistentFlags().StringVarP(&config, "config", "c", "", "config.yaml")
 	rootCmd.PersistentFlags().StringP("serviceprovider", "s", "", "Service Provider (Cloudflare, bind)")
+	rootCmd.PersistentFlags().StringP("textcomment", "t", "", "Comment")
 
 }
diff --git a/cmd/updateRecord.go b/cmd/updateRecord.go
@@ -28,6 +28,7 @@ var updateRecordCmd = &cobra.Command{
 		proxied, _ := cmd.Flags().GetBool("proxied")
 		zone, _ := cmd.Flags().GetString("zone")
 		serviceprovider, _ := cmd.Flags().GetString("serviceprovider")
+		comment, _ := cmd.Flags().GetString("comment")
 
 		if dnsapi.CheckEmpty(ip, "ip address", "-i|--ip 123.123.123.123") ||
 			dnsapi.CheckEmpty(domain, "domain", "-d|--domain test.domain.tld") {
@@ -42,7 +43,7 @@ var updateRecordCmd = &cobra.Command{
 			zoneID := dnsconfig.Cloudflare.ZoneId
 			token := dnsconfig.Cloudflare.Token
 
-			dnsapi.UpdateRecord(zoneID, token, domain, rtype, ip, proxied)
+			dnsapi.UpdateRecord(zoneID, token, domain, rtype, ip, proxied, comment)
 
 			resp, recordID, err := dnsapi.GetRecordId(zoneID, token, domain)
 

diff --git a/dnsapi/cloudflare.go b/dnsapi/cloudflare.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 )
 
-func AddRecord(zoneID string, token string, domain string, rtype string, ip string, proxied bool) (string, error) {
+func AddRecord(zoneID string, token string, domain string, rtype string, ip string, proxied bool, comment string) (string, error) {
 
 	var msg = ""
 	url := fmt.Sprintf("https://api.cloudflare.com/client/v4/zones/%s/dns_records", zoneID)
@@ -19,6 +19,7 @@ func AddRecord(zoneID string, token string, domain string, rtype string, ip stri
 		Content: ip,
 		TTL:     1,
 		Proxied: proxied,
+		Comment: comment,
 	}
 
 	jsonData, err := json.Marshal(dnsRecord)
@@ -53,7 +54,7 @@ func AddRecord(zoneID string, token string, domain string, rtype string, ip stri
 	return msg, nil
 }
 
-func UpdateRecord(zoneID string, token string, domain string, rtype string, ip string, proxied bool) (string, error) {
+func UpdateRecord(zoneID string, token string, domain string, rtype string, ip string, proxied bool, comment string) (string, error) {
 
 	exists, recordID, _ := GetRecordId(zoneID, token, domain)
 
@@ -68,6 +69,7 @@ func UpdateRecord(zoneID string, token string, domain string, rtype string, ip s
 			Content: ip,
 			TTL:     1,
 			Proxied: proxied,
+			Comment: comment,
 		}
 
 		jsonData, err := json.Marshal(dnsRecord)

diff --git a/dnsapi/structs.go b/dnsapi/structs.go
@@ -18,6 +18,7 @@ type DNSRecord struct {
 	Content string `json:"content"` // IP-Adresse oder Zielinhalt des Records
 	TTL     int    `json:"ttl"`     // Time-To-Live in Sekunden (z.B. 1 für "Auto")
 	Proxied bool   `json:"proxied"` // Ob der Record über Cloudflare geleitet werden soll
+	Comment string `json:"comment,omitempty"`
 }
 
 type Config struct {
@@ -44,5 +45,6 @@ type Config struct {
 		Proxied  bool     `yaml:"proxied"`
 		Rtype    string   `yaml:"rtype"`
 		Domains  []string `yaml:"domains"`
+		Comment  string   `yaml:"comment"`
 	}
 }