Skip to content

Test ParametersFrom feature #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
google-prow-robot merged 2 commits into from
Aug 3, 2018
Merged

Test ParametersFrom feature #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b20e543
Remove unmarshalJSON method
grantr Aug 1, 2018
0e52771
Test the secret retrieval code
grantr Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions pkg/controller/feed/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,9 @@ func (r *reconciler) fetchParametersFromSource(namespace string, parametersFrom
return nil, err
}

p, err := unmarshalJSON(data)
if err != nil {
return nil, err
if err := json.Unmarshal(data, &params); err != nil {
return nil, fmt.Errorf("failed to unmarshal parameters as JSON object: %v", err)
}
params = p

}
return params, nil
}
Expand All @@ -427,14 +424,6 @@ func (r *reconciler) fetchSecretKeyValue(namespace string, secretKeyRef *feedsv1
return secret.Data[secretKeyRef.Key], nil
}

func unmarshalJSON(in []byte) (map[string]interface{}, error) {
parameters := make(map[string]interface{})
if err := json.Unmarshal(in, &parameters); err != nil {
return nil, fmt.Errorf("failed to unmarshal parameters as JSON object: %v", err)
}
return parameters, nil
}

func (r *reconciler) createJob(feed *feedsv1alpha1.Feed, es *feedsv1alpha1.EventSource, et *feedsv1alpha1.EventType) (*batchv1.Job, error) {
trigger, err := r.resolveTrigger(feed)
if err != nil {
Expand Down
106 changes: 83 additions & 23 deletions pkg/controller/feed/reconcile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,21 @@ var testCases = []controllertesting.TestCase{
//TODO job created event
},
},
{
Name: "new feed with secret ref: secret gets to job",
InitialState: []runtime.Object{
getEventSource(),
getEventType(),
getFeedSecret(),
getNewSecretFeed(),
},
ReconcileKey: "test/test-feed",
WantPresent: []runtime.Object{
getSecretStartInProgressFeed(),
getNewSecretStartJob(),
//TODO job created event
},
},
{
Name: "in progress feed with existing job: both unchanged",
InitialState: []runtime.Object{
Expand Down Expand Up @@ -320,31 +335,42 @@ func getNewFeed() *feedsv1alpha1.Feed {
}
}

func getFeedFailingWithMissingEventSource() *feedsv1alpha1.Feed {
return &feedsv1alpha1.Feed{
TypeMeta: feedType(),
ObjectMeta: om("test", "test-feed"),
Spec: feedsv1alpha1.FeedSpec{
Action: feedsv1alpha1.FeedAction{
DNSName: targetDNS,
},
Trigger: feedsv1alpha1.EventTrigger{
EventType: getEventType().Name,
Resource: "",
Service: "",
Parameters: nil,
ParametersFrom: nil,
},
},
Status: feedsv1alpha1.FeedStatus{
Conditions: []feedsv1alpha1.FeedCondition{{
Type: feedsv1alpha1.FeedConditionDependenciesSatisfied,
Status: corev1.ConditionFalse,
Reason: "TestGenerated",
Message: "Test generated",
}},
func getFeedSecret() *corev1.Secret {
secretMap := map[string]interface{}{"foo": "bar"}
data, err := json.Marshal(secretMap)
if err != nil {
panic(err)
}
return &corev1.Secret{
ObjectMeta: om("test", "feed-secret"),
Data: map[string][]byte{
"test-secret-key": data,
},
}

}

func getNewSecretFeed() *feedsv1alpha1.Feed {
feed := getNewFeed()
feed.Spec.Trigger.ParametersFrom = []feedsv1alpha1.ParametersFromSource{{
SecretKeyRef: &feedsv1alpha1.SecretKeyReference{
Name: getFeedSecret().Name,
Key: "test-secret-key",
},
}}
return feed
}

func getFeedFailingWithMissingEventSource() *feedsv1alpha1.Feed {
feed := getNewFeed()
feed.Status.InitializeConditions()
feed.Status.SetCondition(&feedsv1alpha1.FeedCondition{
Type: feedsv1alpha1.FeedConditionDependenciesSatisfied,
Status: corev1.ConditionFalse,
Reason: "TestGenerated",
Message: "test generated",
})
return feed
}

func getStartInProgressFeed() *feedsv1alpha1.Feed {
Expand All @@ -369,6 +395,17 @@ func getStartInProgressFeed() *feedsv1alpha1.Feed {
return feed
}

func getSecretStartInProgressFeed() *feedsv1alpha1.Feed {
Copy link
Copy Markdown
Contributor Author

@grantr grantr Aug 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dprotaso The builder code from knative/serving#1762 would have been helpful here.

feed := getStartInProgressFeed()
feed.Spec.Trigger.ParametersFrom = []feedsv1alpha1.ParametersFromSource{{
SecretKeyRef: &feedsv1alpha1.SecretKeyReference{
Name: getFeedSecret().Name,
Key: "test-secret-key",
},
}}
return feed
}

func getStartedFeed() *feedsv1alpha1.Feed {
feed := getStartInProgressFeed()
marshalledContext, err := json.Marshal(getFeedContext().Context)
Expand Down Expand Up @@ -502,6 +539,29 @@ func getNewStartJob() *batchv1.Job {
}
}

func getNewSecretStartJob() *batchv1.Job {
job := getNewStartJob()
envVars := job.Spec.Template.Spec.Containers[0].Env
var newEnvVars []corev1.EnvVar
for _, envVar := range envVars {
if envVar.Name == string(resources.EnvVarTrigger) {
newEnvVars = append(newEnvVars, corev1.EnvVar{
Name: string(resources.EnvVarTrigger),
Value: base64.StdEncoding.EncodeToString(bytesOrDie(json.Marshal(
sources.EventTrigger{
EventType: "test-et",
Parameters: map[string]interface{}{"foo": "bar"},
},
))),
})
} else {
newEnvVars = append(newEnvVars, envVar)
}
}
job.Spec.Template.Spec.Containers[0].Env = newEnvVars
return job
}

func getInProgressStartFeedJob() *batchv1.Job {
job := getNewStartJob()
// This is normally set by a webhook. Set it here
Expand Down