merge prerelease branch

Author: eli-darkly

ldcontext/builder_multi.go

@@ -53,14 +53,14 @@ func NewMultiBuilder() *MultiBuilder {
 // than a multi-kind context.
 func (m *MultiBuilder) Build() Context {
 	if len(m.contexts) == 0 {
-		return Context{err: errContextKindMultiWithNoKinds}
+		return Context{defined: true, err: errContextKindMultiWithNoKinds}
 	}
 
 	if len(m.contexts) == 1 {
 		// Never return a multi-kind context with just one kind; instead return the individual one
 		c := m.contexts[0]
 		if c.Multiple() {
-			return Context{err: errContextKindMultiWithinMulti}
+			return Context{defined: true, err: errContextKindMultiWithinMulti}
 		}
 		return c
 	}
@@ -99,7 +99,8 @@ func (m *MultiBuilder) Build() Context {
 	}
 	if len(errs) != 0 {
 		return Context{
-			err: errors.New(strings.Join(errs, ", ")),
+			defined: true,
+			err:     errors.New(strings.Join(errs, ", ")),
 		}
 	}
 

ldcontext/builder_multi_test.go

@@ -18,36 +18,15 @@ func TestMultiBuilder(t *testing.T) {
 		sub2 := NewWithKind("user", "my-user-key")
 		c0 := NewMultiBuilder().Add(sub1).Add(sub2).Build()
 
+		assert.True(t, c0.IsDefined())
 		assert.NoError(t, c0.Err())
 		assert.Equal(t, Kind("multi"), c0.Kind())
 		assert.Equal(t, "", c0.Key())
 
-		assert.Equal(t, 2, c0.MultiKindCount())
+		assert.Equal(t, 2, c0.IndividualContextCount())
 
-		c1a, ok := c0.MultiKindByIndex(0)
-		assert.True(t, ok)
-		assert.Equal(t, sub1, c1a)
-
-		c1b, ok := c0.MultiKindByName("org")
-		assert.True(t, ok)
-		assert.Equal(t, sub1, c1b)
-
-		c2a, ok := c0.MultiKindByIndex(1)
-		assert.True(t, ok)
-		assert.Equal(t, sub2, c2a)
-
-		c2b, ok := c0.MultiKindByName("user")
-		assert.True(t, ok)
-		assert.Equal(t, sub2, c2b)
-
-		_, ok = c0.MultiKindByIndex(-1)
-		assert.False(t, ok)
-
-		_, ok = c0.MultiKindByIndex(2)
-		assert.False(t, ok)
-
-		_, ok = c0.MultiKindByName("notfound")
-		assert.False(t, ok)
+		assert.Equal(t, []Context{sub1, sub2}, c0.GetAllIndividualContexts(nil))
+		// other accessors are tested in context_test.go
 	})
 }
 
@@ -68,9 +47,11 @@ func TestMultiBuilderFullyQualifiedKey(t *testing.T) {
 func TestMultiBuilderErrors(t *testing.T) {
 	verifyError := func(t *testing.T, builder *MultiBuilder, expectedErr error) {
 		c0 := builder.Build()
+		assert.True(t, c0.IsDefined())
 		assert.Equal(t, expectedErr, c0.Err())
 
 		c1, err := builder.TryBuild()
+		assert.True(t, c1.IsDefined())
 		assert.Equal(t, expectedErr, c1.Err())
 		assert.Equal(t, expectedErr, err)
 	}
@@ -119,12 +100,12 @@ func TestMultiBuilderCopyOnWrite(t *testing.T) {
 	b.Add(c1).Add(c2)
 
 	multi1 := b.Build()
-	assert.Equal(t, 2, multi1.MultiKindCount())
+	assert.Equal(t, 2, multi1.IndividualContextCount())
 
 	c3 := NewWithKind("thing", "stuff")
 	b.Add(c3)
 
 	multi2 := b.Build()
-	assert.Equal(t, 3, multi2.MultiKindCount())
-	assert.Equal(t, 2, multi1.MultiKindCount()) // unchanged
+	assert.Equal(t, 3, multi2.IndividualContextCount())
+	assert.Equal(t, 2, multi1.IndividualContextCount()) // unchanged
 }

ldcontext/builder_simple.go

@@ -96,10 +96,10 @@ func (b *Builder) Build() Context {
 	}
 	actualKind, err := validateSingleKind(b.kind)
 	if err != nil {
-		return Context{err: err, kind: b.kind}
+		return Context{defined: true, err: err, kind: b.kind}
 	}
 	if b.key == "" && !b.allowEmptyKey {
-		return Context{err: errContextKeyEmpty, kind: b.kind}
+		return Context{defined: true, err: errContextKeyEmpty, kind: b.kind}
 	}
 	// We set the kind in the error cases above because that improves error reporting if this
 	// context is used within a multi-kind context.

ldcontext/builder_simple_test.go

@@ -35,6 +35,7 @@ func makeBasicBuilder() *Builder {
 
 func TestBuilderDefaultProperties(t *testing.T) {
 	c := NewBuilder("my-key").Build()
+	assert.True(t, c.IsDefined())
 	assert.NoError(t, c.Err())
 	assert.Equal(t, DefaultKind, c.Kind())
 	assert.Equal(t, "my-key", c.Key())
@@ -51,9 +52,11 @@ func TestBuilderKindValidation(t *testing.T) {
 			b := NewBuilder("my-key").Kind(Kind(p.kind))
 
 			c0 := b.Build()
+			assert.True(t, c0.IsDefined())
 			assert.Equal(t, p.err, c0.Err())
 
 			c1, err := b.TryBuild()
+			assert.True(t, c1.IsDefined())
 			assert.Equal(t, p.err, c1.Err())
 			assert.Equal(t, p.err, err)
 		})
@@ -64,9 +67,11 @@ func TestBuilderKeyValidation(t *testing.T) {
 	b := NewBuilder("")
 
 	c0 := b.Build()
+	assert.True(t, c0.IsDefined())
 	assert.Equal(t, errContextKeyEmpty, c0.Err())
 
 	c1, err := b.TryBuild()
+	assert.True(t, c1.IsDefined())
 	assert.Equal(t, errContextKeyEmpty, c1.Err())
 	assert.Equal(t, errContextKeyEmpty, err)
 }