Skip to content
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

Jump to bottom

Use constant blocks to define constants in pkg/kubectl #76724

Merged
merged 1 commit into from
Apr 18, 2019
+16 −16
Merged

Use constant blocks to define constants in pkg/kubectl #76724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions pkg/kubectl/cmd/apply/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ const (
dirName = "../../../../test/fixtures/pkg/kubectl/cmd/apply/testdir"
filenameRCJSON = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.json"

filenameWidgetClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.yaml"
filenameWidgetServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml"
filenameWidgetClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.yaml"
filenameWidgetServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml"
filenameDeployObjServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml"
filenameDeployObjClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml"
)

func readConfigMapList(t *testing.T, filename string) [][]byte {
Expand Down Expand Up @@ -870,11 +872,6 @@ func testApplyMultipleObjects(t *testing.T, asList bool) {
}
}

const (
filenameDeployObjServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml"
filenameDeployObjClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml"
)

func readDeploymentFromFile(t *testing.T, file string) []byte {
raw := readBytesFromFile(t, file)
obj := &appsv1.Deployment{}
Expand Down
8 changes: 5 additions & 3 deletions pkg/kubectl/cmd/set/set_serviceaccount_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,16 @@ import (
"k8s.io/kubernetes/pkg/kubectl/scheme"
)

const serviceAccount = "serviceaccount1"
const serviceAccountMissingErrString = "serviceaccount is required"
const resourceMissingErrString = `You must provide one or more resources by argument or filename.
const (
serviceAccount = "serviceaccount1"
serviceAccountMissingErrString = "serviceaccount is required"
resourceMissingErrString = `You must provide one or more resources by argument or filename.
Example resource specifications include:
'-f rsrc.yaml'
'--filename=rsrc.json'
'<resource> <name>'
'<resource>'`
)

func TestSetServiceAccountLocal(t *testing.T) {
inputs := []struct {
Expand Down
13 changes: 7 additions & 6 deletions pkg/kubectl/explain/model_printer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ import (
"k8s.io/kube-openapi/pkg/util/proto"
)

// fieldIndentLevel is the level of indentation for fields.
const fieldIndentLevel = 3

// descriptionIndentLevel is the level of indentation for the
// description.
const descriptionIndentLevel = 5
const (
// fieldIndentLevel is the level of indentation for fields.
fieldIndentLevel = 3
// descriptionIndentLevel is the level of indentation for the
// description.
descriptionIndentLevel = 5
)

// modelPrinter prints a schema in Writer. Its "Builder" will decide if
// it's recursive or not.
Expand Down