Merge pull request #2 from kazeburo/support-fqdn

support fqdn with final dot record name
sacloud · Mar 9, 2021 · b958c76 · b958c76
2 parents baf0670 + 0e062ae
commit b958c76
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -23,3 +23,4 @@ brews:
     homepage: "https://github.com/kazeburo/sacloudns"
     install: |
       bin.install "sacloudns"
+  
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ Help Options:
 [radd command options]
           --zone=         dnszone name to add a record
           --ttl=          record TTL to add (default: 300)
-          --name=         record NAME to add
+          --name=         record NAME or FQDN(with final dot) to add
           --type=         record TYPE to add
           --data=         record DATA to add
           --wait          wait for record propagation
@@ -85,7 +85,7 @@ Add an A record
 Add a TXT for DNS challenge
 
 ```
-./sacloudns radd --wait --zone example.com --name _acme --type TXT --data xxxxxx --ttl 30
+./sacloudns radd --wait --zone example.com --name _acme.example.com. --type TXT --data xxxxxx --ttl 30
 ```
 
 with `--wait` option, sacloudns wait for DNS record propergation. `--wait` is only available for TXT and CNAME
@@ -102,7 +102,7 @@ Help Options:
 [rset command options]
           --zone=         dnszone name to set a record
           --ttl=          record TTL to set (default: 300)
-          --name=         record NAME to set
+          --name=         record NAME or FQDN(with final dot) to set
           --type=         record TYPE to set
           --data=         record DATA to set
           --wait          wait for record propagation
@@ -121,13 +121,16 @@ Help Options:
   -h, --help      Show this help message
 
 [rdelete command options]
-          --zone= dnszone name to set a record
-          --name= record NAME to set
-          --type= record TYPE to set
-          --data= record DATA to set
+          --zone= dnszone name to delete a record
+          --name= record NAME or FQDN(with final dot) to delete
+          --type= record TYPE to delete
+          --data= record DATA to delete
 ```
 
 ```
 ./sacloudns rdelete --zone example.com --name test --type A --data 192.168.0.1
 ```
 
+```
+./sacloudns rdelete --zone example.com --name _acme.example.com. --type TXT --data xxxxxx --ttl 30
+```
diff --git a/main.go b/main.go
@@ -34,7 +34,7 @@ type zoneOpts struct {
 type raddOpts struct {
 	Zone        string        `long:"zone" description:"dnszone name to add a record"`
 	TTL         int           `long:"ttl" description:"record TTL to add" default:"300"`
-	Name        string        `long:"name" description:"record NAME to add" required:"true"`
+	Name        string        `long:"name" description:"record NAME or FQDN(with final dot) to add" required:"true"`
 	Type        string        `long:"type" description:"record TYPE to add" required:"true"`
 	RData       string        `long:"data" description:"record DATA to add" required:"true"`
 	Wait        bool          `long:"wait" description:"wait for record propagation"`
@@ -44,18 +44,18 @@ type raddOpts struct {
 type rsetOpts struct {
 	Zone        string        `long:"zone" description:"dnszone name to set a record"`
 	TTL         int           `long:"ttl" description:"record TTL to set" default:"300"`
-	Name        string        `long:"name" description:"record NAME to set" required:"true"`
+	Name        string        `long:"name" description:"record NAME or FQDN(with final dot) to set" required:"true"`
 	Type        string        `long:"type" description:"record TYPE to set" required:"true"`
 	RData       string        `long:"data" description:"record DATA to set" required:"true"`
 	Wait        bool          `long:"wait" description:"wait for record propagation"`
 	WaitTimeout time.Duration `long:"wait-timeout" description:"wait timeout for record propagation" default:"60s"`
 }
 
 type rdelOpts struct {
-	Zone  string `long:"zone" description:"dnszone name to set a record"`
-	Name  string `long:"name" description:"record NAME to set" required:"true"`
-	Type  string `long:"type" description:"record TYPE to set" required:"true"`
-	RData string `long:"data" description:"record DATA to set" required:"true"`
+	Zone  string `long:"zone" description:"dnszone name to delete a record"`
+	Name  string `long:"name" description:"record NAME or FQDN(with final dot) to delete" required:"true"`
+	Type  string `long:"type" description:"record TYPE to delete" required:"true"`
+	RData string `long:"data" description:"record DATA to delete" required:"true"`
 }
 
 type mainOpts struct {
@@ -215,6 +215,13 @@ func fetchZone(ctx context.Context, name string) (*sacloud.DNS, error) {
 	return result.DNS[0], nil
 }
 
+func rewriteName(Name, Zone string) string {
+	if !strings.HasSuffix(Name, ".") {
+		return Name
+	}
+	return strings.TrimSuffix(Name, "."+Zone+".")
+}
+
 func (opts *zoneOpts) Execute(args []string) error {
 	if opts.Name == "" && len(args) > 0 {
 		opts.Name = args[0]
@@ -244,6 +251,7 @@ func (opts *raddOpts) Execute(args []string) error {
 	if err != nil {
 		return err
 	}
+	opts.Name = rewriteName(opts.Name, opts.Zone)
 	new := sacloud.NewDNSRecord(
 		types.EDNSRecordType(opts.Type),
 		opts.Name,
@@ -289,6 +297,7 @@ func (opts *rsetOpts) Execute(args []string) error {
 	if err != nil {
 		return err
 	}
+	opts.Name = rewriteName(opts.Name, opts.Zone)
 	new := sacloud.NewDNSRecord(
 		types.EDNSRecordType(opts.Type),
 		opts.Name,
@@ -330,6 +339,7 @@ func (opts *rdelOpts) Execute(args []string) error {
 	if err != nil {
 		return err
 	}
+	opts.Name = rewriteName(opts.Name, opts.Zone)
 	delete := sacloud.NewDNSRecord(
 		types.EDNSRecordType(opts.Type),
 		opts.Name,