Merge lp:~gz/goamz/example_dns into lp:goamz

[Martin Packman]

Use testing.invalid rather than example.com

Stop using example.com addresses in testing code, which
may accidentally be used in a real lookup. Taking the
'.invalid' option from RFC 2606 means the resolve should
always fail locally.

https://codereview.appspot.com/12765043/

[Martin Packman (gz)]

Reviewers: mp+179717_code.launchpad.net,

Message:
Please take a look.

Description:
Use testing.invalid rather than example.com

Stop using example.com addresses in testing code, which
may accidentally be used in a real lookup. Taking the
'.invalid' option from RFC 2606 means the resolve should
always fail locally.

https://code.launchpad.net/~gz/goamz/example_dns/+merge/179717

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/12765043/

Affected files:
   A [revision details]
   M ec2/ec2t_test.go
   M ec2/ec2test/server.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: ec2/ec2t_test.go
=== modified file 'ec2/ec2t_test.go'
--- ec2/ec2t_test.go 2013-01-31 17:06:10 +0000
+++ ec2/ec2t_test.go 2013-08-12 14:33:16 +0000
@@ -68,7 +68,7 @@
   })
   c.Assert(err, IsNil)
   c.Assert(inst, NotNil)
- c.Assert(inst.Instances[0].DNSName, Equals,
inst.Instances[0].InstanceId+".example.com")
+ c.Assert(inst.Instances[0].DNSName, Equals,
inst.Instances[0].InstanceId+".testing.invalid")

   id := inst.Instances[0].InstanceId

Index: ec2/ec2test/server.go
=== modified file 'ec2/ec2test/server.go'
--- ec2/ec2test/server.go 2013-01-31 17:06:10 +0000
+++ ec2/ec2test/server.go 2013-08-12 14:33:16 +0000
@@ -548,7 +548,7 @@
    InstanceId: inst.id,
    InstanceType: inst.instType,
    ImageId: inst.imageId,
- DNSName: fmt.Sprintf("%s.example.com", inst.id),
+ DNSName: fmt.Sprintf("%s.testing.invalid", inst.id),
    // TODO the rest
   }
  }

[Roger Peppe (rogpeppe)]

On 2013/08/12 14:38:40, gz wrote:
> Please take a look.

LGTM but wait for niemeyer.

https://codereview.appspot.com/12765043/

[Gustavo Niemeyer (niemeyer)]

What is preventing .invalid from being looked up?

[niemeyer@gopher ~]% sudo tcpdump -i wlan0 -A dst host 8.8.8.8 &
[niemeyer@gopher ~]% host foo.invalid
13:02:51.554495 IP gopher.local.44235 >
google-public-dns-a.google.com.domain: 32253+ A? foo.invalid. (29)
E..9C...@......j.......5.%..}............foo.invalid.....
13:02:51.555282 IP gopher.local.45925 >
google-public-dns-a.google.com.domain: 21752+ PTR? 8.8.8.8.in-addr.arpa.
(38)
E..B..@.@......j.....e.5..o.T............8.8.8.8.in-addr.arpa.....
13:02:51.721887 IP gopher.local.41656 >
google-public-dns-a.google.com.domain: 11674+ PTR?
106.157.168.192.in-addr.arpa. (46)
E..J..@.@......j.......5.6..-............106.157.168.192.in-addr.arpa.....
13:02:51.917257 IP gopher.local.35635 >
google-public-dns-a.google.com.domain: 45783+ A? foo.invalid. (29)
E..9C...@......j.....3.5.%...............foo.invalid.....
Host foo.invalid not found: 3(NXDOMAIN)

https://codereview.appspot.com/12765043/

[Martin Packman (gz)]

On 2013/08/15 16:03:41, niemeyer wrote:
> What is preventing .invalid from being looked up?

You're right, nothing really, it's just convention that it won't exist.
In practice, it fails a little faster, as it doesn't need to talk to the
example.com dns server to see if a new subdomain really exists.

https://codereview.appspot.com/12765043/

=== modified file 'ec2/ec2t_test.go'
--- ec2/ec2t_test.go	2013-01-31 17:06:10 +0000
+++ ec2/ec2t_test.go	2013-08-12 14:40:35 +0000
@@ -68,7 +68,7 @@
 	})
 	c.Assert(err, IsNil)
 	c.Assert(inst, NotNil)
-	c.Assert(inst.Instances[0].DNSName, Equals, inst.Instances[0].InstanceId+".example.com")
+	c.Assert(inst.Instances[0].DNSName, Equals, inst.Instances[0].InstanceId+".testing.invalid")
 
 	id := inst.Instances[0].InstanceId
 

=== modified file 'ec2/ec2test/server.go'
--- ec2/ec2test/server.go	2013-08-02 06:41:16 +0000
+++ ec2/ec2test/server.go	2013-08-12 14:40:35 +0000
@@ -548,8 +548,12 @@
 		InstanceId:   inst.id,
 		InstanceType: inst.instType,
 		ImageId:      inst.imageId,
+<<<<<<< TREE
 		DNSName:      fmt.Sprintf("%s.example.com", inst.id),
 		State:        inst.state,
+=======
+		DNSName:      fmt.Sprintf("%s.testing.invalid", inst.id),
+>>>>>>> MERGE-SOURCE
 		// TODO the rest
 	}
 }