Skip to content

Commit e050e85

Browse files
author
gentele
committed
fix codeclimate issues
1 parent dcdcfe2 commit e050e85

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

pkg/devspace/config/configutil/merge.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"unsafe"
66
)
77

8-
func Merge(objectPointer interface{}, overwriteObjectPointer interface{}) {
9-
objectPointerUnsafe := unsafe.Pointer(&objectPointer)
10-
overwriteObjectPointerUnsafe := unsafe.Pointer(&overwriteObjectPointer)
8+
// Merge deeply merges two objects
9+
func Merge(object interface{}, overwriteObject interface{}) {
10+
objectPointerUnsafe := unsafe.Pointer(&object)
11+
overwriteObjectPointerUnsafe := unsafe.Pointer(&overwriteObject)
1112

12-
merge(objectPointer, overwriteObjectPointer, objectPointerUnsafe, overwriteObjectPointerUnsafe)
13+
merge(object, overwriteObject, objectPointerUnsafe, overwriteObjectPointerUnsafe)
1314
}
1415

1516
func merge(objectPointer interface{}, overwriteObjectPointer interface{}, objectPointerUnsafe unsafe.Pointer, overwriteObjectPointerUnsafe unsafe.Pointer) {

pkg/devspace/registry/registry.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func CreatePullSecret(kubectl *kubernetes.Clientset, namespace string, registryC
6666
return nil
6767
}
6868

69-
// InitRegistry deploys and starts a new docker registry if necessary
69+
// InitInternalRegistry deploys and starts a new docker registry if necessary
7070
func InitInternalRegistry(kubectl *kubernetes.Clientset, helm *helm.HelmClientWrapper, internalRegistry *v1.InternalRegistry, registryConfig *v1.RegistryConfig) error {
7171
registryReleaseName := *internalRegistry.Release.Name
7272
registryReleaseNamespace := *internalRegistry.Release.Namespace
@@ -204,6 +204,7 @@ func GetImageURL(imageConfig *v1.ImageConfig, includingLatestTag bool) string {
204204
return image
205205
}
206206

207+
// GetRegistryConfig returns the registry config for an image or an error if the registry is not defined
207208
func GetRegistryConfig(imageConfig *v1.ImageConfig) (*v1.RegistryConfig, error) {
208209
config := configutil.GetConfig(false)
209210
registryName := *imageConfig.Registry

0 commit comments

Comments
 (0)