Skip to content

Commit 63fc6f8

Browse files
committed
Extract from templates internal subpackage the file updating machinery
Signed-off-by: Adrian Orive <[email protected]>
1 parent 66baebf commit 63fc6f8

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

pkg/scaffold/internal/templates/v2/internal/string_utils.go renamed to pkg/scaffold/internal/machinery/string_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
package internal
16+
package machinery
1717

1818
import (
1919
"bufio"

pkg/scaffold/internal/templates/v2/internal/string_utils_test.go renamed to pkg/scaffold/internal/machinery/string_utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
package internal
16+
package machinery
1717

1818
import (
1919
"bytes"

pkg/scaffold/internal/templates/v2/controller/controller_suitetest.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"sigs.k8s.io/kubebuilder/pkg/model/file"
2424
"sigs.k8s.io/kubebuilder/pkg/model/resource"
25+
"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery"
2526
templatesv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2"
26-
"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/internal"
2727
)
2828

2929
var _ file.Template = &SuiteTest{}
@@ -130,7 +130,7 @@ Expect(err).NotTo(HaveOccurred())
130130
131131
`, f.Resource.ImportAlias)
132132

133-
err := internal.InsertStringsInFile(f.Path,
133+
err := machinery.InsertStringsInFile(f.Path,
134134
map[string][]string{
135135
templatesv2.APIPkgImportScaffoldMarker: {ctrlImportCodeFragment, apiImportCodeFragment},
136136
templatesv2.APISchemeScaffoldMarker: {addschemeCodeFragment},

pkg/scaffold/internal/templates/v2/crd/kustomization.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"sigs.k8s.io/kubebuilder/pkg/model/file"
2424
"sigs.k8s.io/kubebuilder/pkg/model/resource"
25-
"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/internal"
25+
"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery"
2626
)
2727

2828
const (
@@ -62,7 +62,7 @@ func (f *Kustomization) Update() error {
6262
kustomizeWebhookPatchCodeFragment := fmt.Sprintf("#- patches/webhook_in_%s.yaml\n", f.Resource.Plural)
6363
kustomizeCAInjectionPatchCodeFragment := fmt.Sprintf("#- patches/cainjection_in_%s.yaml\n", f.Resource.Plural)
6464

65-
return internal.InsertStringsInFile(f.Path,
65+
return machinery.InsertStringsInFile(f.Path,
6666
map[string][]string{
6767
kustomizeResourceScaffoldMarker: {kustomizeResourceCodeFragment},
6868
kustomizeWebhookPatchScaffoldMarker: {kustomizeWebhookPatchCodeFragment},

pkg/scaffold/internal/templates/v2/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sigs.k8s.io/kubebuilder/pkg/model/config"
2424
"sigs.k8s.io/kubebuilder/pkg/model/file"
2525
"sigs.k8s.io/kubebuilder/pkg/model/resource"
26-
"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/internal"
26+
"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery"
2727
)
2828

2929
const (
@@ -101,7 +101,7 @@ func (f *Main) Update(opts *MainUpdateOptions) error {
101101
`, opts.Resource.ImportAlias, opts.Resource.Kind, opts.Resource.Kind)
102102

103103
if opts.WireResource {
104-
err := internal.InsertStringsInFile(path,
104+
err := machinery.InsertStringsInFile(path,
105105
map[string][]string{
106106
APIPkgImportScaffoldMarker: {apiImportCodeFragment},
107107
APISchemeScaffoldMarker: {addschemeCodeFragment},
@@ -112,7 +112,7 @@ func (f *Main) Update(opts *MainUpdateOptions) error {
112112
}
113113

114114
if opts.WireController {
115-
return internal.InsertStringsInFile(path,
115+
return machinery.InsertStringsInFile(path,
116116
map[string][]string{
117117
APIPkgImportScaffoldMarker: {apiImportCodeFragment, ctrlImportCodeFragment},
118118
APISchemeScaffoldMarker: {addschemeCodeFragment},
@@ -121,7 +121,7 @@ func (f *Main) Update(opts *MainUpdateOptions) error {
121121
}
122122

123123
if opts.WireWebhook {
124-
return internal.InsertStringsInFile(path,
124+
return machinery.InsertStringsInFile(path,
125125
map[string][]string{
126126
APIPkgImportScaffoldMarker: {apiImportCodeFragment, ctrlImportCodeFragment},
127127
APISchemeScaffoldMarker: {addschemeCodeFragment},

0 commit comments

Comments
 (0)