Skip to content

Commit 9d804ba

Browse files
authored
fix lint errors in internal (#469)
1 parent 808df20 commit 9d804ba

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

internal/k8sdeps/factory.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ See the License for the specific language governing permissions and
1111
limitations under the License.
1212
*/
1313

14+
// Package k8sdeps provides kustomize factory with k8s dependencies
1415
package k8sdeps
1516

1617
import (

internal/k8sdeps/transformer/factory.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ import (
2424
"sigs.k8s.io/kustomize/pkg/transformers"
2525
)
2626

27-
// factoryImpl makes patch transformer and name hash transformer
28-
type factoryImpl struct{}
27+
// FactoryImpl makes patch transformer and name hash transformer
28+
type FactoryImpl struct{}
2929

3030
// NewFactoryImpl makes a new factoryImpl instance
31-
func NewFactoryImpl() *factoryImpl {
32-
return &factoryImpl{}
31+
func NewFactoryImpl() *FactoryImpl {
32+
return &FactoryImpl{}
3333
}
3434

3535
// MakePatchTransformer makes a new patch transformer
36-
func (p *factoryImpl) MakePatchTransformer(slice []*resource.Resource, rf *resource.Factory) (transformers.Transformer, error) {
36+
func (p *FactoryImpl) MakePatchTransformer(slice []*resource.Resource, rf *resource.Factory) (transformers.Transformer, error) {
3737
return patch.NewPatchTransformer(slice, rf)
3838
}
3939

4040
// MakeHashTransformer makes a new name hash transformer
41-
func (p *factoryImpl) MakeHashTransformer() transformers.Transformer {
41+
func (p *FactoryImpl) MakeHashTransformer() transformers.Transformer {
4242
return hash.NewNameHashTransformer()
4343
}

internal/k8sdeps/transformer/patch/patchconflictdetector.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (smp *strategicMergePatch) findConflict(
131131
}
132132

133133
func (smp *strategicMergePatch) mergePatches(patch1, patch2 *resource.Resource) (*resource.Resource, error) {
134-
mergeJsonMap, err := strategicpatch.MergeStrategicMergeMapPatchUsingLookupPatchMeta(
134+
mergeJSONMap, err := strategicpatch.MergeStrategicMergeMapPatchUsingLookupPatchMeta(
135135
smp.lookupPatchMeta, patch1.Map(), patch2.Map())
136-
return smp.rf.FromMap(mergeJsonMap), err
136+
return smp.rf.FromMap(mergeJSONMap), err
137137
}

0 commit comments

Comments
 (0)