Skip to content

Commit 424a61d

Browse files
Ish Shahjoelanford
Ish Shah
authored and
joelanford
committed
internal: bring scorecard and scaffold up one level (#2005)
* bring scorecard and scaffold up one level
1 parent 7f46876 commit 424a61d

File tree

153 files changed

+180
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+180
-181
lines changed

‎cmd/operator-sdk/add/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"path/filepath"
2222

2323
"github.com/operator-framework/operator-sdk/cmd/operator-sdk/internal/genutil"
24-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
25-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
24+
"github.com/operator-framework/operator-sdk/internal/scaffold"
25+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2626
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2727

2828
"github.com/pkg/errors"

‎cmd/operator-sdk/add/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package add
1717
import (
1818
"fmt"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2222
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2323

2424
log "github.com/sirupsen/logrus"

‎cmd/operator-sdk/add/crd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"path/filepath"
2121
"strings"
2222

23-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
24-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
23+
"github.com/operator-framework/operator-sdk/internal/scaffold"
24+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2525
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2626

2727
log "github.com/sirupsen/logrus"

‎cmd/operator-sdk/build/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
25+
"github.com/operator-framework/operator-sdk/internal/scaffold"
2626
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2727

2828
log "github.com/sirupsen/logrus"

‎cmd/operator-sdk/internal/genutil/genutil.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"io/ioutil"
1919
"os"
2020

21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold"
2222

2323
log "github.com/sirupsen/logrus"
2424
)

‎cmd/operator-sdk/internal/genutil/k8s.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"path/filepath"
2222
"strings"
2323

24-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
24+
"github.com/operator-framework/operator-sdk/internal/scaffold"
2525
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
2626
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2727

‎cmd/operator-sdk/internal/genutil/openapi.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"path/filepath"
2222
"strings"
2323

24-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
25-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
24+
"github.com/operator-framework/operator-sdk/internal/scaffold"
25+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2626
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
2727
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2828

‎cmd/operator-sdk/migrate/cmd.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"os"
2020
"path/filepath"
2121

22-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
23-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
24-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
25-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
22+
"github.com/operator-framework/operator-sdk/internal/scaffold"
23+
"github.com/operator-framework/operator-sdk/internal/scaffold/ansible"
24+
"github.com/operator-framework/operator-sdk/internal/scaffold/helm"
25+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2626
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2727

2828
"github.com/pkg/errors"

‎cmd/operator-sdk/new/cmd.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
26-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
27-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
28-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
25+
"github.com/operator-framework/operator-sdk/internal/scaffold"
26+
"github.com/operator-framework/operator-sdk/internal/scaffold/ansible"
27+
"github.com/operator-framework/operator-sdk/internal/scaffold/helm"
28+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2929
"github.com/operator-framework/operator-sdk/internal/util/projutil"
3030

3131
"github.com/pkg/errors"

‎cmd/operator-sdk/olmcatalog/gen-csv.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"io/ioutil"
2020
"path/filepath"
2121

22-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
23-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
24-
catalog "github.com/operator-framework/operator-sdk/internal/pkg/scaffold/olm-catalog"
22+
"github.com/operator-framework/operator-sdk/internal/scaffold"
23+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
24+
catalog "github.com/operator-framework/operator-sdk/internal/scaffold/olm-catalog"
2525
"github.com/operator-framework/operator-sdk/internal/util/fileutil"
2626
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
2727
"github.com/operator-framework/operator-sdk/internal/util/projutil"

‎cmd/operator-sdk/printdeps/cmd.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ package printdeps
1717
import (
1818
"fmt"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
22-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/ansible"
22+
"github.com/operator-framework/operator-sdk/internal/scaffold/helm"
2323
"github.com/operator-framework/operator-sdk/internal/util/projutil"
24-
2524
"github.com/spf13/cobra"
2625
)
2726

‎cmd/operator-sdk/scorecard/cmd.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package scorecard
1717
import (
1818
"fmt"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scorecard"
21-
schelpers "github.com/operator-framework/operator-sdk/internal/pkg/scorecard/helpers"
22-
scplugins "github.com/operator-framework/operator-sdk/internal/pkg/scorecard/plugins"
20+
"github.com/operator-framework/operator-sdk/internal/scorecard"
21+
schelpers "github.com/operator-framework/operator-sdk/internal/scorecard/helpers"
22+
scplugins "github.com/operator-framework/operator-sdk/internal/scorecard/plugins"
2323

2424
"github.com/spf13/cobra"
2525
"github.com/spf13/viper"

‎cmd/operator-sdk/test/local.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
25+
"github.com/operator-framework/operator-sdk/internal/scaffold"
2626
"github.com/operator-framework/operator-sdk/internal/util/fileutil"
2727
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2828
"github.com/operator-framework/operator-sdk/internal/util/yamlutil"

‎cmd/operator-sdk/up/local.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626
"syscall"
2727

28-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
28+
"github.com/operator-framework/operator-sdk/internal/scaffold"
2929
k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
3030
"github.com/operator-framework/operator-sdk/internal/util/projutil"
3131
"github.com/operator-framework/operator-sdk/pkg/ansible"

‎doc/dev/release.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,17 +196,17 @@ $ git checkout -b release-v1.3.0
196196
Commit the following changes:
197197
198198
- `version/version.go`: update `Version` to `v1.3.0`.
199-
- `internal/pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
199+
- `internal/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
200200
- Comment out `branch = "master"`
201201
- Un-comment `version = "v1.2.0"`
202202
- Change `v1.2.0` to `v1.3.0`
203-
- `internal/pkg/scaffold/ansible/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
204-
- `internal/pkg/scaffold/helm/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
205-
- `internal/pkg/scaffold/go_mod.go`, in the `replace` block for `github.com/operator-framework/operator-sdk`:
203+
- `internal/scaffold/ansible/gopkgtoml.go`: same as for `internal/scaffold/gopkgtoml.go`.
204+
- `internal/scaffold/helm/gopkgtoml.go`: same as for `internal/scaffold/gopkgtoml.go`.
205+
- `internal/scaffold/go_mod.go`, in the `replace` block for `github.com/operator-framework/operator-sdk`:
206206
- Add the following `replace` line to the bottom of `go.mod`: `replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v1.3.0`.
207207
- If a `replace` line already exists, change the version to `v1.3.0`.
208-
- `internal/pkg/scaffold/helm/go_mod.go`: same as for `internal/pkg/scaffold/go_mod.go`.
209-
- `internal/pkg/scaffold/ansible/go_mod.go`: same as for `internal/pkg/scaffold/go_mod.go`.
208+
- `internal/scaffold/helm/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
209+
- `internal/scaffold/ansible/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
210210
- `CHANGELOG.md`: update the `## Unreleased` header to `## v1.3.0`.
211211
- `doc/user/install-operator-sdk.md`: update the linux and macOS URLs to point to the new release URLs.
212212
@@ -243,15 +243,15 @@ Once this tag passes CI, go to step 3. For more info on tagging, see the [releas
243243
Check out a new branch from master (or use your `release-v1.3.0` branch) and commit the following changes:
244244
245245
- `version/version.go`: update `Version` to `v1.3.0+git`.
246-
- `internal/pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
246+
- `internal/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
247247
- Comment out `version = "v1.3.0"`
248248
- Un-comment `branch = "master"`
249-
- `internal/pkg/scaffold/ansible/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
250-
- `internal/pkg/scaffold/helm/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
251-
- `internal/pkg/scaffold/go_mod.go`, in the `replace` block for `github.com/operator-framework/operator-sdk`:
249+
- `internal/scaffold/ansible/gopkgtoml.go`: same as for `internal/scaffold/gopkgtoml.go`.
250+
- `internal/scaffold/helm/gopkgtoml.go`: same as for `internal/scaffold/gopkgtoml.go`.
251+
- `internal/scaffold/go_mod.go`, in the `replace` block for `github.com/operator-framework/operator-sdk`:
252252
- Remove the `replace` line at the bottom of `go.mod`: `replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v1.3.0`.
253-
- `internal/pkg/scaffold/helm/go_mod.go`: same as for `internal/pkg/scaffold/go_mod.go`.
254-
- `internal/pkg/scaffold/ansible/go_mod.go`: same as for `internal/pkg/scaffold/go_mod.go`.
253+
- `internal/scaffold/helm/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
254+
- `internal/scaffold/ansible/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
255255
- `CHANGELOG.md`: add the following as a new set of headers above `## v1.3.0`:
256256
257257
```markdown

‎hack/image/ansible/scaffold-ansible-image.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package main
1616

1717
import (
18-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
19-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
18+
"github.com/operator-framework/operator-sdk/internal/scaffold"
19+
"github.com/operator-framework/operator-sdk/internal/scaffold/ansible"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2121
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2222

2323
log "github.com/sirupsen/logrus"

‎hack/image/helm/scaffold-helm-image.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package main
1717
import (
1818
"log"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
22-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/helm"
22+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2323
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2424
)
2525

‎internal/pkg/scaffold/add_controller.go renamed to ‎internal/scaffold/add_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package scaffold
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2121
)
2222

2323
// AddController is the input needed to generate a pkg/controller/add_<kind>.go file

‎internal/pkg/scaffold/add_controller_test.go renamed to ‎internal/scaffold/add_controller_test.go

File renamed without changes.

‎internal/pkg/scaffold/addtoscheme.go renamed to ‎internal/scaffold/addtoscheme.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"path/filepath"
2020
"strings"
2121

22-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
22+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2323
)
2424

2525
// AddToScheme is the input needed to generate an addtoscheme_<group>_<version>.go file

‎internal/pkg/scaffold/addtoscheme_test.go renamed to ‎internal/scaffold/addtoscheme_test.go

File renamed without changes.

‎internal/pkg/scaffold/ansible/OWNERS renamed to ‎internal/scaffold/ansible/OWNERS

File renamed without changes.

‎internal/pkg/scaffold/ansible/ao_logs.go renamed to ‎internal/scaffold/ansible/ao_logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2121
)
2222

2323
//DockerfileHybrid - Dockerfile for a hybrid operator

‎internal/pkg/scaffold/ansible/build_dockerfile.go renamed to ‎internal/scaffold/ansible/build_dockerfile.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"path/filepath"
1919
"strings"
2020

21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
22-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold"
22+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2323
"github.com/operator-framework/operator-sdk/version"
2424
)
2525

‎internal/pkg/scaffold/ansible/build_test_framework_ansible_test_script.go renamed to ‎internal/scaffold/ansible/build_test_framework_ansible_test_script.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2222
)
2323

2424
const BuildTestFrameworkAnsibleTestScriptFile = "ansible-test.sh"

‎internal/pkg/scaffold/ansible/build_test_framework_dockerfile.go renamed to ‎internal/scaffold/ansible/build_test_framework_dockerfile.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2222
)
2323

2424
const BuildTestFrameworkDockerfileFile = "Dockerfile"

‎internal/pkg/scaffold/ansible/constants.go renamed to ‎internal/scaffold/ansible/constants.go

File renamed without changes.

‎internal/pkg/scaffold/ansible/deploy_operator.go renamed to ‎internal/scaffold/ansible/deploy_operator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2222
)
2323

2424
const DeployOperatorFile = "operator.yaml"

‎internal/pkg/scaffold/ansible/dockerfilehybrid.go renamed to ‎internal/scaffold/ansible/dockerfilehybrid.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2222
)
2323

2424
//DockerfileHybrid - Dockerfile for a hybrid operator

‎internal/pkg/scaffold/ansible/entrypoint.go renamed to ‎internal/scaffold/ansible/entrypoint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2121
)
2222

2323
// Entrypoint - entrypoint script

‎internal/pkg/scaffold/ansible/go_mod.go renamed to ‎internal/scaffold/ansible/go_mod.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package ansible
1717
import (
1818
"fmt"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/internal/deps"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/internal/deps"
2222
)
2323

2424
const GoModFile = "go.mod"

‎internal/pkg/scaffold/ansible/gopkgtoml.go renamed to ‎internal/scaffold/ansible/gopkgtoml.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package ansible
1717
import (
1818
"fmt"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
21-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold"
21+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2222
)
2323

2424
// GopkgToml - the Gopkg.toml file for a hybrid operator

‎internal/pkg/scaffold/ansible/input.go renamed to ‎internal/scaffold/ansible/input.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
package ansible
1515

1616
import (
17-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
17+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
1818
"github.com/spf13/afero"
1919
)
2020

‎internal/pkg/scaffold/ansible/k8s_status.go renamed to ‎internal/scaffold/ansible/k8s_status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package ansible
1616

1717
import (
18-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
18+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
1919
)
2020

2121
const K8sStatusPythonFile = "library/k8s_status.py"

‎internal/pkg/scaffold/ansible/main.go renamed to ‎internal/scaffold/ansible/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2121
)
2222

2323
// Main - main source file for ansible operator

‎internal/pkg/scaffold/ansible/molecule_default_asserts.go renamed to ‎internal/scaffold/ansible/molecule_default_asserts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2121
)
2222

2323
const MoleculeDefaultAssertsFile = "asserts.yml"

‎internal/pkg/scaffold/ansible/molecule_default_molecule.go renamed to ‎internal/scaffold/ansible/molecule_default_molecule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package ansible
1717
import (
1818
"path/filepath"
1919

20-
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
20+
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2121
)
2222

2323
const MoleculeDefaultMoleculeFile = "molecule.yml"

0 commit comments

Comments
 (0)