Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

⚠ Generate controllers with API Group name as package names in multi-group projects (only Go plugin v3) #1729

Merged
merged 1 commit into from
Oct 21, 2020
Merged

⚠ Generate controllers with API Group name as package names in multi-group projects (only Go plugin v3) #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/plugin/v3/scaffolds/internal/templates/config/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ func (f *Controller) SetTemplateDefaults() error {
//nolint:lll
const controllerTemplate = `{{ .Boilerplate }}

{{if and .MultiGroup .Resource.Group }}
package {{ .Resource.GroupPackageName }}
{{else}}
package controllers
{{end}}

import (
"context"
Expand Down
4 changes: 4 additions & 0 deletions pkg/plugin/v3/scaffolds/internal/templates/config/controller/controller_suitetest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@ func (f *SuiteTest) GetCodeFragments() file.CodeFragmentsMap {

const controllerSuiteTestTemplate = `{{ .Boilerplate }}

{{if and .MultiGroup .Resource.Group }}
package {{ .Resource.GroupPackageName }}
{{else}}
package controllers
{{end}}

import (
"path/filepath"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/crew/captain_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package crew

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/crew/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package crew

import (
"path/filepath"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package foopolicy

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/foo.policy/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package foopolicy

import (
"path/filepath"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/sea-creatures/kraken_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package seacreatures

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/sea-creatures/leviathan_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package seacreatures

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/sea-creatures/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package seacreatures

import (
"path/filepath"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/ship/cruiser_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package ship

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/ship/destroyer_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package ship

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/ship/frigate_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package ship

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion testdata/project-v3-multigroup/controllers/ship/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package ship

import (
"path/filepath"
Expand Down