-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
[codegen] Generate exported constants for group and version. #563
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -60,8 +60,8 @@ func TestResourceGenerator(t *testing.T) { | |||||
files, err := ResourceGenerator(false).Generate(kinds...) | ||||||
require.Nil(t, err) | ||||||
// Check number of files generated | ||||||
// 12 (6 -> object, spec, metadata, status, schema, codec) * 2 versions | ||||||
assert.Len(t, files, 12) | ||||||
// 14 (6 -> object, spec, metadata, status, schema, codec, constants) * 2 versions | ||||||
assert.Len(t, files, 14, "should be 14 files generated, got %d", len(files)) | ||||||
// Check content against the golden files | ||||||
compareToGolden(t, files, "go/groupbykind") | ||||||
}) | ||||||
|
@@ -70,8 +70,8 @@ func TestResourceGenerator(t *testing.T) { | |||||
files, err := ResourceGenerator(true).Generate(kinds...) | ||||||
require.Nil(t, err) | ||||||
// Check number of files generated | ||||||
// 12 (6 -> object, spec, metadata, status, schema, codec) * 2 versions | ||||||
assert.Len(t, files, 12) | ||||||
// 14 (6 -> object, spec, metadata, status, schema, codec, constants) * 2 versions | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
assert.Len(t, files, 14, "should be 14 files generated, got %d", len(files)) | ||||||
// Check content against the golden files | ||||||
compareToGolden(t, files, "go/groupbygroup") | ||||||
}) | ||||||
|
@@ -80,7 +80,7 @@ func TestResourceGenerator(t *testing.T) { | |||||
files, err := ResourceGenerator(true).Generate(sameGroupKinds...) | ||||||
require.Nil(t, err) | ||||||
// Check number of files generated | ||||||
assert.Len(t, files, 18) | ||||||
assert.Len(t, files, 20, "should be 20 files generated, got %d", len(files)) | ||||||
// Check content against the golden files | ||||||
compareToGolden(t, files, "go/groupbygroup") | ||||||
}) | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
package jennies | ||
|
||
import ( | ||
"bytes" | ||
"go/format" | ||
"path/filepath" | ||
|
||
"github.com/grafana/codejen" | ||
"github.com/grafana/grafana-app-sdk/codegen" | ||
"github.com/grafana/grafana-app-sdk/codegen/templates" | ||
) | ||
|
||
// Constants is a Jenny which creates package-wide exported constants | ||
type Constants struct { | ||
// GroupByKind determines whether kinds are grouped by GroupVersionKind or just GroupVersion. | ||
// If GroupByKind is true, generated paths are <kind>/<version>/<file>, instead of the default <version>/<file>. | ||
GroupByKind bool | ||
} | ||
|
||
func (c *Constants) JennyName() string { | ||
return "ConstantsGenerator" | ||
} | ||
|
||
type constantsFileParams struct { | ||
group string | ||
version string | ||
path string | ||
} | ||
|
||
func (c *Constants) Generate(kinds ...codegen.Kind) (codejen.Files, error) { | ||
m := make(map[string]constantsFileParams) | ||
for _, k := range kinds { | ||
for _, v := range k.Versions() { | ||
path := GetGeneratedPath(c.GroupByKind, k, v.Version) | ||
if _, ok := m[path]; !ok { | ||
m[path] = constantsFileParams{ | ||
group: k.Properties().Group, | ||
version: v.Version, | ||
path: filepath.Join(path, "constants.go"), | ||
} | ||
} | ||
} | ||
} | ||
files := make(codejen.Files, 0) | ||
for _, v := range m { | ||
b := bytes.Buffer{} | ||
err := templates.WriteConstantsFile(templates.ConstantsMetadata{ | ||
Package: ToPackageName(v.version), | ||
Group: v.group, | ||
Version: v.version, | ||
}, &b) | ||
if err != nil { | ||
return nil, err | ||
} | ||
formatted, err := format.Source(b.Bytes()) | ||
if err != nil { | ||
return nil, err | ||
} | ||
files = append(files, codejen.File{ | ||
RelativePath: v.path, | ||
From: []codejen.NamedJenny{c}, | ||
Data: formatted, | ||
}) | ||
} | ||
return files, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package {{ .Package }} | ||
|
||
import "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
||
const ( | ||
// Group is the API group used by all kinds in this package | ||
Group = "{{ .Group }}" | ||
// Version is the API version used by all kinds in this package | ||
Version = "{{ .Version }}" | ||
) | ||
|
||
var ( | ||
// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package | ||
GroupVersion = schema.GroupVersion{ | ||
Group: Group, | ||
Version: Version, | ||
} | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
codegen/testing/golden_generated/go/groupbygroup/customapp/v0_0/constants.go.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package v0_0 | ||
|
||
import "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
||
const ( | ||
// Group is the API group used by all kinds in this package | ||
Group = "customapp.ext.grafana.com" | ||
// Version is the API version used by all kinds in this package | ||
Version = "v0-0" | ||
) | ||
|
||
var ( | ||
// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package | ||
GroupVersion = schema.GroupVersion{ | ||
Group: Group, | ||
Version: Version, | ||
} | ||
) |
18 changes: 18 additions & 0 deletions
18
codegen/testing/golden_generated/go/groupbygroup/customapp/v1_0/constants.go.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package v1_0 | ||
|
||
import "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
||
const ( | ||
// Group is the API group used by all kinds in this package | ||
Group = "customapp.ext.grafana.com" | ||
// Version is the API version used by all kinds in this package | ||
Version = "v1-0" | ||
) | ||
|
||
var ( | ||
// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package | ||
GroupVersion = schema.GroupVersion{ | ||
Group: Group, | ||
Version: Version, | ||
} | ||
) |
18 changes: 18 additions & 0 deletions
18
codegen/testing/golden_generated/go/groupbygroup/testapp/v1/constants.go.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package v1 | ||
|
||
import "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
||
const ( | ||
// Group is the API group used by all kinds in this package | ||
Group = "testapp.ext.grafana.com" | ||
// Version is the API version used by all kinds in this package | ||
Version = "v1" | ||
) | ||
|
||
var ( | ||
// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package | ||
GroupVersion = schema.GroupVersion{ | ||
Group: Group, | ||
Version: Version, | ||
} | ||
) |
18 changes: 18 additions & 0 deletions
18
codegen/testing/golden_generated/go/groupbygroup/testapp/v2/constants.go.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package v2 | ||
|
||
import "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
||
const ( | ||
// Group is the API group used by all kinds in this package | ||
Group = "testapp.ext.grafana.com" | ||
// Version is the API version used by all kinds in this package | ||
Version = "v2" | ||
) | ||
|
||
var ( | ||
// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package | ||
GroupVersion = schema.GroupVersion{ | ||
Group: Group, | ||
Version: Version, | ||
} | ||
) |
18 changes: 18 additions & 0 deletions
18
codegen/testing/golden_generated/go/groupbykind/customkind/v0_0/constants.go.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package v0_0 | ||
|
||
import "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
||
const ( | ||
// Group is the API group used by all kinds in this package | ||
Group = "customapp.ext.grafana.com" | ||
// Version is the API version used by all kinds in this package | ||
Version = "v0-0" | ||
) | ||
|
||
var ( | ||
// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package | ||
GroupVersion = schema.GroupVersion{ | ||
Group: Group, | ||
Version: Version, | ||
} | ||
) |
18 changes: 18 additions & 0 deletions
18
codegen/testing/golden_generated/go/groupbykind/customkind/v1_0/constants.go.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package v1_0 | ||
|
||
import "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
||
const ( | ||
// Group is the API group used by all kinds in this package | ||
Group = "customapp.ext.grafana.com" | ||
// Version is the API version used by all kinds in this package | ||
Version = "v1-0" | ||
) | ||
|
||
var ( | ||
// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package | ||
GroupVersion = schema.GroupVersion{ | ||
Group: Group, | ||
Version: Version, | ||
} | ||
) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.