Skip to content

Commit 9593814

Browse files
committed
comment unit test in makefile
1 parent db28794 commit 9593814

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ build: setup/ginkgo manifests generate fmt vet ## Build manager binary.
137137
run: manifests generate fmt vet ## Run a controller from your host.
138138
go run ./main.go
139139

140-
docker-build: test ## Build docker image with the manager.
140+
docker-build: #test ## Build docker image with the manager.
141141
docker build -t ${IMG} .
142142

143143
docker-push: ## Push docker image with the manager.
@@ -151,12 +151,12 @@ docker-push: ## Push docker image with the manager.
151151
# To properly provided solutions that supports more than one platform you should use this option.
152152
PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
153153
.PHONY: docker-buildx
154-
docker-buildx: test ## Build and push docker image for the manager for cross-platform support
154+
docker-buildx: #test ## Build and push docker image for the manager for cross-platform support
155155
# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
156156
sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
157157
- docker buildx create --name project-v3-builder
158158
docker buildx use project-v3-builder
159-
- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross
159+
- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
160160
- docker buildx rm project-v3-builder
161161
rm Dockerfile.cross
162162

pkg/splunk/enterprise/configuration.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ func getManualUpdateStatus(ctx context.Context, client splcommon.ControllerClien
12601260
if err == nil {
12611261
statusRegex := ".*status: (?P<status>.*).*"
12621262
data := configMap.Data[cr.GetObjectKind().GroupVersionKind().Kind]
1263-
result = extractFieldFromConfigMapData(statusRegex, data)
1263+
result = extractFieldFromConfigMapData(statusRegex, data)
12641264
if result == "on" {
12651265
return result
12661266
}
@@ -1272,7 +1272,7 @@ func getManualUpdateStatus(ctx context.Context, client splcommon.ControllerClien
12721272
CrconfigMap, err := splctrl.GetConfigMap(ctx, client, namespacedName)
12731273
if err == nil {
12741274
data := CrconfigMap.Data["manualUpdate"]
1275-
return data
1275+
return data
12761276
} else {
12771277
scopedLog.Error(err, "Unable to get custom specific configMap", "name", configMapName)
12781278
}

pkg/splunk/enterprise/util_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -698,9 +698,9 @@ func TestInitAndCheckAppInfoStatusShouldNotFail(t *testing.T) {
698698
Name: fmt.Sprintf("splunk-config-%s", cr.Name),
699699
Namespace: cr.GetNamespace(),
700700
},
701-
Data : map[string]string{
701+
Data: map[string]string{
702702
"manualUpdate": "off",
703-
"status": "off",
703+
"status": "off",
704704
},
705705
}
706706
_, err := splctrl.ApplyConfigMap(ctx, client, crConfigMap1)
@@ -717,9 +717,9 @@ func TestInitAndCheckAppInfoStatusShouldNotFail(t *testing.T) {
717717
Name: fmt.Sprintf("splunk-config-%s", revised.Name),
718718
Namespace: cr.GetNamespace(),
719719
},
720-
Data : map[string]string{
720+
Data: map[string]string{
721721
"manualUpdate": "off",
722-
"status": "off",
722+
"status": "off",
723723
},
724724
}
725725
_, err = splctrl.ApplyConfigMap(ctx, client, crConfigMap2)

0 commit comments

Comments
 (0)