This repository was archived by the owner on Jun 26, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 89
service-binding-operator-967 #993
Closed
isutton
wants to merge
2
commits into
redhat-developer:master
from
isutton:service-binding-operator-967
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -928,6 +928,74 @@ var _ = Describe("Integration Collect definitions + items", func() { | |
|
||
}) | ||
|
||
// TODO: spec title should be rephrased: should we have one spec for regression tests? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would just add these tests cases under others for the existing specs. |
||
var _ = Describe("Issue 943", func() { | ||
var ( | ||
mockCtrl *gomock.Controller | ||
) | ||
|
||
BeforeEach(func() { | ||
mockCtrl = gomock.NewController(GinkgoT()) | ||
}) | ||
|
||
AfterEach(func() { | ||
mockCtrl.Finish() | ||
}) | ||
|
||
type testCase struct { | ||
serviceContent map[string]interface{} | ||
expectedItems []*pipeline.BindingItem | ||
secrets map[string]*unstructured.Unstructured | ||
configMaps map[string]*unstructured.Unstructured | ||
} | ||
|
||
It("retrieve binding data", | ||
func() { | ||
tc := testCase{ | ||
serviceContent: map[string]interface{}{ | ||
"metadata": map[string]interface{}{ | ||
"annotations": map[string]interface{}{ | ||
"service.binding/java-maven_port": "path={.status.ports},elementType=sliceOfMaps,sourceKey=name,sourceValue=asdf", | ||
}, | ||
}, | ||
"status": map[string]interface{}{ | ||
"ports": []interface{}{ | ||
map[string]interface{}{"name": "foo", "value": "bar"}, | ||
}, | ||
}, | ||
}, | ||
} | ||
|
||
ctx := mocks.NewMockContext(mockCtrl) | ||
service := mocks.NewMockService(mockCtrl) | ||
serviceResource := &unstructured.Unstructured{Object: tc.serviceContent} | ||
|
||
ctx.EXPECT().Services().Return([]pipeline.Service{service}, nil).MinTimes(1) | ||
|
||
var bindingDefs []binding.Definition | ||
service.EXPECT().AddBindingDef(gomock.Any()).DoAndReturn(func(bd binding.Definition) { bindingDefs = append(bindingDefs, bd) }).Times(len(serviceResource.GetAnnotations())) | ||
service.EXPECT().BindingDefs().DoAndReturn(func() []binding.Definition { return bindingDefs }) | ||
service.EXPECT().Resource().Return(serviceResource).Times(2) | ||
|
||
crd := mocks.NewMockCRD(mockCtrl) | ||
crd.EXPECT().Descriptor().Return(nil, nil) | ||
crd.EXPECT().Resource().Return(&unstructured.Unstructured{}) | ||
service.EXPECT().CustomResourceDefinition().Return(crd, nil) | ||
|
||
// TODO: msg must be rephrased. | ||
ctx.EXPECT().SetCondition( | ||
v1alpha1.Conditions().NotCollectionReady(). | ||
Reason("ValueNotFound"). | ||
Msg("Value for key java-maven_port_foo not found"). | ||
Build()) | ||
|
||
collect.BindingDefinitions(ctx) | ||
collect.BindingItems(ctx) | ||
}, | ||
) | ||
|
||
}) | ||
|
||
type bindingDefMatcher struct { | ||
path []string | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
apart from setting the condition, you need to do these as well:
Also, please extract
ValueNotFound
into a constant and put around other constant in the same file.