Extract from templates internal subpackage the file updating machinery

Signed-off-by: Adrian Orive <adrian.orive.oneca@gmail.com>
kubernetes-sigs · Feb 6, 2020 · 63fc6f8 · 63fc6f8
1 parent 66baebf
commit 63fc6f8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/...nal/templates/v2/internal/string_utils.go → ...affold/internal/machinery/string_utils.go b/...nal/templates/v2/internal/string_utils.go → ...affold/internal/machinery/string_utils.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package internal
+package machinery
 
 import (
 	"bufio"

diff --git a/...emplates/v2/internal/string_utils_test.go → ...d/internal/machinery/string_utils_test.go b/...emplates/v2/internal/string_utils_test.go → ...d/internal/machinery/string_utils_test.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package internal
+package machinery
 
 import (
 	"bytes"

diff --git a/pkg/scaffold/internal/templates/v2/controller/controller_suitetest.go b/pkg/scaffold/internal/templates/v2/controller/controller_suitetest.go
@@ -22,8 +22,8 @@ import (
 
 	"sigs.k8s.io/kubebuilder/pkg/model/file"
 	"sigs.k8s.io/kubebuilder/pkg/model/resource"
+	"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery"
 	templatesv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/internal"
 )
 
 var _ file.Template = &SuiteTest{}
@@ -130,7 +130,7 @@ Expect(err).NotTo(HaveOccurred())
 
 `, f.Resource.ImportAlias)
 
-	err := internal.InsertStringsInFile(f.Path,
+	err := machinery.InsertStringsInFile(f.Path,
 		map[string][]string{
 			templatesv2.APIPkgImportScaffoldMarker: {ctrlImportCodeFragment, apiImportCodeFragment},
 			templatesv2.APISchemeScaffoldMarker:    {addschemeCodeFragment},

diff --git a/pkg/scaffold/internal/templates/v2/crd/kustomization.go b/pkg/scaffold/internal/templates/v2/crd/kustomization.go
@@ -22,7 +22,7 @@ import (
 
 	"sigs.k8s.io/kubebuilder/pkg/model/file"
 	"sigs.k8s.io/kubebuilder/pkg/model/resource"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/internal"
+	"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery"
 )
 
 const (
@@ -62,7 +62,7 @@ func (f *Kustomization) Update() error {
 	kustomizeWebhookPatchCodeFragment := fmt.Sprintf("#- patches/webhook_in_%s.yaml\n", f.Resource.Plural)
 	kustomizeCAInjectionPatchCodeFragment := fmt.Sprintf("#- patches/cainjection_in_%s.yaml\n", f.Resource.Plural)
 
-	return internal.InsertStringsInFile(f.Path,
+	return machinery.InsertStringsInFile(f.Path,
 		map[string][]string{
 			kustomizeResourceScaffoldMarker:         {kustomizeResourceCodeFragment},
 			kustomizeWebhookPatchScaffoldMarker:     {kustomizeWebhookPatchCodeFragment},

diff --git a/pkg/scaffold/internal/templates/v2/main.go b/pkg/scaffold/internal/templates/v2/main.go
@@ -23,7 +23,7 @@ import (
 	"sigs.k8s.io/kubebuilder/pkg/model/config"
 	"sigs.k8s.io/kubebuilder/pkg/model/file"
 	"sigs.k8s.io/kubebuilder/pkg/model/resource"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/internal"
+	"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery"
 )
 
 const (
@@ -101,7 +101,7 @@ func (f *Main) Update(opts *MainUpdateOptions) error {
 `, opts.Resource.ImportAlias, opts.Resource.Kind, opts.Resource.Kind)
 
 	if opts.WireResource {
-		err := internal.InsertStringsInFile(path,
+		err := machinery.InsertStringsInFile(path,
 			map[string][]string{
 				APIPkgImportScaffoldMarker: {apiImportCodeFragment},
 				APISchemeScaffoldMarker:    {addschemeCodeFragment},
@@ -112,7 +112,7 @@ func (f *Main) Update(opts *MainUpdateOptions) error {
 	}
 
 	if opts.WireController {
-		return internal.InsertStringsInFile(path,
+		return machinery.InsertStringsInFile(path,
 			map[string][]string{
 				APIPkgImportScaffoldMarker:    {apiImportCodeFragment, ctrlImportCodeFragment},
 				APISchemeScaffoldMarker:       {addschemeCodeFragment},
@@ -121,7 +121,7 @@ func (f *Main) Update(opts *MainUpdateOptions) error {
 	}
 
 	if opts.WireWebhook {
-		return internal.InsertStringsInFile(path,
+		return machinery.InsertStringsInFile(path,
 			map[string][]string{
 				APIPkgImportScaffoldMarker:    {apiImportCodeFragment, ctrlImportCodeFragment},
 				APISchemeScaffoldMarker:       {addschemeCodeFragment},