Skip to content

Commit 9fd5519

Browse files
juanvallejojuanvallejo
committed
break dep on pkg/oc - generator/generator.go
1 parent 33c21b7 commit 9fd5519

File tree

16 files changed

+35
-16
lines changed

16 files changed

+35
-16
lines changed

‎pkg/build/generator/generator.go

+23-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
2727
imageapi "github.com/openshift/origin/pkg/image/apis/image"
2828
imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
29-
"github.com/openshift/origin/pkg/oc/admin/policy"
3029
)
3130

3231
const conflictRetries = 3
@@ -260,8 +259,8 @@ func (g *BuildGenerator) instantiate(ctx apirequest.Context, request *buildapi.B
260259
// Add labels and annotations from the buildrequest. Existing
261260
// label/annotations will take precedence because we don't want system
262261
// annotations/labels (eg buildname) to get stomped on.
263-
newBuild.Annotations = policy.MergeMaps(request.Annotations, newBuild.Annotations)
264-
newBuild.Labels = policy.MergeMaps(request.Labels, newBuild.Labels)
262+
newBuild.Annotations = mergeMaps(request.Annotations, newBuild.Annotations)
263+
newBuild.Labels = mergeMaps(request.Labels, newBuild.Labels)
265264

266265
// Copy build trigger information and build arguments to the build object.
267266
newBuild.Spec.TriggeredBy = request.TriggeredBy
@@ -919,3 +918,24 @@ func setBuildAnnotationAndLabel(bcCopy *buildapi.BuildConfig, build *buildapi.Bu
919918
build.Labels[buildapi.BuildConfigLabel] = buildapi.LabelValue(bcCopy.Name)
920919
build.Labels[buildapi.BuildRunPolicyLabel] = string(bcCopy.Spec.RunPolicy)
921920
}
921+
922+
// mergeMaps will merge to map[string]string instances, with
923+
// keys from the second argument overwriting keys from the
924+
// first argument, in case of duplicates.
925+
func mergeMaps(a, b map[string]string) map[string]string {
926+
if a == nil && b == nil {
927+
return nil
928+
}
929+
930+
res := make(map[string]string)
931+
932+
for k, v := range a {
933+
res[k] = v
934+
}
935+
936+
for k, v := range b {
937+
res[k] = v
938+
}
939+
940+
return res
941+
}

‎pkg/cmd/admin/policy/modify_roles_test.go ‎pkg/oc/admin/policy/modify_roles_test.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
1111
fakeauthorizationclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset/fake"
12-
"github.com/openshift/origin/pkg/oc/admin/policy"
1312
)
1413

1514
func TestModifyNamedClusterRoleBinding(t *testing.T) {
@@ -126,11 +125,11 @@ func TestModifyNamedClusterRoleBinding(t *testing.T) {
126125
}
127126
for tcName, tc := range tests {
128127
// Set up modifier options and run AddRole()
129-
o := &policy.RoleModificationOptions{
128+
o := &RoleModificationOptions{
130129
RoleName: tc.inputRole,
131130
RoleBindingName: tc.inputRoleBindingName,
132131
Users: tc.inputSubjects,
133-
RoleBindingAccessor: policy.NewClusterRoleBindingAccessor(fakeauthorizationclient.NewSimpleClientset(tc.existingClusterRoleBindings).Authorization()),
132+
RoleBindingAccessor: NewClusterRoleBindingAccessor(fakeauthorizationclient.NewSimpleClientset(tc.existingClusterRoleBindings).Authorization()),
134133
}
135134

136135
addRoleAndCheck(t, o, tcName, tc.expectedRoleBindingName, tc.expectedSubjects)
@@ -259,19 +258,19 @@ func TestModifyNamedLocalRoleBinding(t *testing.T) {
259258
}
260259
for tcName, tc := range tests {
261260
// Set up modifier options and run AddRole()
262-
o := &policy.RoleModificationOptions{
261+
o := &RoleModificationOptions{
263262
RoleName: tc.inputRole,
264263
RoleBindingName: tc.inputRoleBindingName,
265264
Users: tc.inputSubjects,
266265
RoleNamespace: metav1.NamespaceDefault,
267-
RoleBindingAccessor: policy.NewLocalRoleBindingAccessor(metav1.NamespaceDefault, fakeauthorizationclient.NewSimpleClientset(tc.existingRoleBindings).Authorization()),
266+
RoleBindingAccessor: NewLocalRoleBindingAccessor(metav1.NamespaceDefault, fakeauthorizationclient.NewSimpleClientset(tc.existingRoleBindings).Authorization()),
268267
}
269268

270269
addRoleAndCheck(t, o, tcName, tc.expectedRoleBindingName, tc.expectedSubjects)
271270
}
272271
}
273272

274-
func addRoleAndCheck(t *testing.T, o *policy.RoleModificationOptions, tcName, expectedName string, expectedSubjects []string) {
273+
func addRoleAndCheck(t *testing.T, o *RoleModificationOptions, tcName, expectedName string, expectedSubjects []string) {
275274
err := o.AddRole()
276275
if err != nil {
277276
t.Errorf("%s: unexpected err %v", tcName, err)

‎pkg/oc/bootstrap/docker/openshift/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
kapi "k8s.io/kubernetes/pkg/api"
88

99
configcmd "github.com/openshift/origin/pkg/config/cmd"
10-
genappcmd "github.com/openshift/origin/pkg/generate/app/cmd"
1110
"github.com/openshift/origin/pkg/oc/bootstrap/docker/errors"
11+
genappcmd "github.com/openshift/origin/pkg/oc/generate/app/cmd"
1212
templateinternalclient "github.com/openshift/origin/pkg/template/client/internalversion"
1313
templateclient "github.com/openshift/origin/pkg/template/generated/internalclientset/typed/template/internalversion"
1414
)

‎pkg/oc/cli/cmd/importer/appjson.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
2525
configcmd "github.com/openshift/origin/pkg/config/cmd"
2626
"github.com/openshift/origin/pkg/generate/app"
27-
appcmd "github.com/openshift/origin/pkg/generate/app/cmd"
2827
"github.com/openshift/origin/pkg/generate/appjson"
28+
appcmd "github.com/openshift/origin/pkg/oc/generate/app/cmd"
2929
templateinternalclient "github.com/openshift/origin/pkg/template/client/internalversion"
3030
templateclient "github.com/openshift/origin/pkg/template/generated/internalclientset/typed/template/internalversion"
3131
)

‎pkg/oc/cli/cmd/newapp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import (
3737
configcmd "github.com/openshift/origin/pkg/config/cmd"
3838
"github.com/openshift/origin/pkg/generate"
3939
newapp "github.com/openshift/origin/pkg/generate/app"
40-
newcmd "github.com/openshift/origin/pkg/generate/app/cmd"
4140
"github.com/openshift/origin/pkg/generate/git"
4241
imageapi "github.com/openshift/origin/pkg/image/apis/image"
42+
newcmd "github.com/openshift/origin/pkg/oc/generate/app/cmd"
4343
routeapi "github.com/openshift/origin/pkg/route/apis/route"
4444
"github.com/openshift/origin/pkg/util"
4545
)

‎pkg/oc/cli/cmd/newapp_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111

1212
configcmd "github.com/openshift/origin/pkg/config/cmd"
13-
newcmd "github.com/openshift/origin/pkg/generate/app/cmd"
1413
imageapi "github.com/openshift/origin/pkg/image/apis/image"
1514
imagefake "github.com/openshift/origin/pkg/image/generated/internalclientset/fake"
15+
newcmd "github.com/openshift/origin/pkg/oc/generate/app/cmd"
1616
templateapi "github.com/openshift/origin/pkg/template/apis/template"
1717
templatefake "github.com/openshift/origin/pkg/template/generated/internalclientset/fake"
1818
)

‎pkg/oc/cli/cmd/newbuild.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
1717
configcmd "github.com/openshift/origin/pkg/config/cmd"
1818
newapp "github.com/openshift/origin/pkg/generate/app"
19-
newcmd "github.com/openshift/origin/pkg/generate/app/cmd"
19+
newcmd "github.com/openshift/origin/pkg/oc/generate/app/cmd"
2020
)
2121

2222
// NewBuildRecommendedCommandName is the recommended command name.

‎pkg/oc/cli/cmd/newbuild_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/MakeNowJust/heredoc"
99
configcmd "github.com/openshift/origin/pkg/config/cmd"
1010
"github.com/openshift/origin/pkg/generate/app"
11-
newcmd "github.com/openshift/origin/pkg/generate/app/cmd"
1211
imagefake "github.com/openshift/origin/pkg/image/generated/internalclientset/fake"
12+
newcmd "github.com/openshift/origin/pkg/oc/generate/app/cmd"
1313
templatefake "github.com/openshift/origin/pkg/template/generated/internalclientset/fake"
1414
)
1515

‎pkg/generate/app/cmd/describe.go ‎pkg/oc/generate/app/cmd/describe.go

File renamed without changes.

‎pkg/generate/app/cmd/newapp.go ‎pkg/oc/generate/app/cmd/newapp.go

File renamed without changes.

‎pkg/generate/app/cmd/newapp_test.go ‎pkg/oc/generate/app/cmd/newapp_test.go

File renamed without changes.

‎pkg/generate/app/cmd/resolve.go ‎pkg/oc/generate/app/cmd/resolve.go

File renamed without changes.

‎pkg/generate/app/cmd/resolve_test.go ‎pkg/oc/generate/app/cmd/resolve_test.go

File renamed without changes.

‎pkg/generate/app/cmd/template.go ‎pkg/oc/generate/app/cmd/template.go

File renamed without changes.

‎pkg/generate/app/cmd/template_test.go ‎pkg/oc/generate/app/cmd/template_test.go

File renamed without changes.

‎test/integration/newapp_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
buildapi "github.com/openshift/origin/pkg/build/apis/build"
3838
"github.com/openshift/origin/pkg/generate"
3939
"github.com/openshift/origin/pkg/generate/app"
40-
"github.com/openshift/origin/pkg/generate/app/cmd"
4140
apptest "github.com/openshift/origin/pkg/generate/app/test"
4241
"github.com/openshift/origin/pkg/generate/dockerfile"
4342
"github.com/openshift/origin/pkg/generate/git"
@@ -48,6 +47,7 @@ import (
4847
imageinternalversion "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
4948
dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
5049
clicmd "github.com/openshift/origin/pkg/oc/cli/cmd"
50+
"github.com/openshift/origin/pkg/oc/generate/app/cmd"
5151
routefake "github.com/openshift/origin/pkg/route/generated/internalclientset/fake"
5252
templateapi "github.com/openshift/origin/pkg/template/apis/template"
5353
templatefake "github.com/openshift/origin/pkg/template/generated/internalclientset/fake"

0 commit comments

Comments
 (0)