fixing TXT record introduced with v0.7.4 (#53)

gardener · Jan 17, 2020 · 3eaae88 · 3eaae88
1 parent 76a6821
commit 3eaae88
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 4 deletions.
diff --git a/pkg/dns/provider/entry.go b/pkg/dns/provider/entry.go
@@ -237,7 +237,7 @@ func validate(state *state, entry *EntryVersion) (targets Targets, warnings []st
  targets = append(targets, new)
  }
  }
- if len(spec.Targets) == 0 {
+ if len(targets) == 0 {
  err = fmt.Errorf("dns entry has only empty text")
  return
  }

diff --git a/test/integration/entryLivecycle_test.go b/test/integration/entryLivecycle_test.go
@@ -55,6 +55,37 @@ var _ = Describe("EntryLivecycle", func() {
  Ω(err).Should(BeNil())
  })
 
+ It("has correct life cycle with provider for TXT record", func() {
+ pr, domain, err := testEnv.CreateSecretAndProvider("inmemory.mock", 0)
+ Ω(err).Should(BeNil())
+
+ defer testEnv.DeleteProviderAndSecret(pr)
+
+ e, err := testEnv.CreateTXTEntry(0, domain)
+ Ω(err).Should(BeNil())
+
+ checkProvider(pr)
+
+ checkEntry(e, pr)
+
+ err = testEnv.DeleteProviderAndSecret(pr)
+ Ω(err).Should(BeNil())
+
+ err = testEnv.AwaitEntryState(e.GetName(), "Error", "")
+ Ω(err).Should(BeNil())
+
+ time.Sleep(10 * time.Second)
+
+ err = testEnv.AwaitEntryState(e.GetName(), "Error")
+ Ω(err).Should(BeNil())
+
+ err = testEnv.AwaitFinalizers(e)
+ Ω(err).Should(BeNil())
+
+ err = testEnv.DeleteEntryAndWait(e)
+ Ω(err).Should(BeNil())
+ })
+
  It("is handled only by owner", func() {
  pr, domain, err := testEnv.CreateSecretAndProvider("inmemory.mock", 0)
  Ω(err).Should(BeNil())

diff --git a/test/integration/testenv.go b/test/integration/testenv.go
@@ -206,8 +206,9 @@ func (te *TestEnv) DeleteProviderAndSecret(pr resources.Object) error {
  return err
 }
 
+type SpecSetter func(e *v1alpha1.DNSEntry)
+
 func (te *TestEnv) CreateEntry(index int, baseDomain string) (resources.Object, error) {
- name := fmt.Sprintf("mock-entry-%d", index)
  target := fmt.Sprintf("1.1.%d.%d", (index/256)%256, index%256)
  ttl := int64(100 + index)
 
@@ -216,17 +217,33 @@ func (te *TestEnv) CreateEntry(index int, baseDomain string) (resources.Object,
  e.Spec.DNSName = fmt.Sprintf("e%d.%s", index, baseDomain)
  e.Spec.Targets = []string{target}
  }
+ return te.CreateEntryGeneric(index, setSpec)
+}
+
+func (te *TestEnv) CreateTXTEntry(index int, baseDomain string) (resources.Object, error) {
+ txt := fmt.Sprintf("text-%d", index)
+ ttl := int64(100 + index)
+
+ setSpec := func(e *v1alpha1.DNSEntry) {
+ e.Spec.TTL = &ttl
+ e.Spec.DNSName = fmt.Sprintf("e%d.%s", index, baseDomain)
+ e.Spec.Text = []string{txt}
+ }
+ return te.CreateEntryGeneric(index, setSpec)
+}
 
+func (te *TestEnv) CreateEntryGeneric(index int, specSetter SpecSetter) (resources.Object, error) {
+ name := fmt.Sprintf("mock-entry-%d", index)
  entry := &v1alpha1.DNSEntry{}
  entry.SetName(name)
  entry.SetNamespace(te.Namespace)
- setSpec(entry)
+ specSetter(entry)
  obj, err := te.resources.CreateObject(entry)
  if errors.IsAlreadyExists(err) {
  te.Infof("Entry %s already existing, updating...", name)
  obj, err = te.GetEntry(name)
  if err == nil {
- setSpec(UnwrapEntry(obj))
+ specSetter(UnwrapEntry(obj))
  err = obj.Update()
  }
  }