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.

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

fix: remove superfluous var usage #5627

Merged
merged 1 commit into from
Jan 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
DoNothingPolicyResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var DoNothingPolicyResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Do Nothing Policy",
PluralDisplayName: "Do Nothing Policies",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshAccessLogResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshAccessLogResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh Access Log",
PluralDisplayName: "Mesh Access Logs",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshCircuitBreakerResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshCircuitBreakerResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh Circuit Breaker",
PluralDisplayName: "Mesh Circuit Breakers",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshHealthCheckResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshHealthCheckResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh Health Check",
PluralDisplayName: "Mesh Health Checks",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshHTTPRouteResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshHTTPRouteResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh HTTP Route",
PluralDisplayName: "Mesh HTTP Routes",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshRateLimitResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshRateLimitResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh Rate Limit",
PluralDisplayName: "Mesh Rate Limits",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshRetryResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshRetryResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh Retry",
PluralDisplayName: "Mesh Retries",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshTimeoutResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshTimeoutResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh Timeout",
PluralDisplayName: "Mesh Timeouts",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshTraceResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshTraceResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh Trace",
PluralDisplayName: "Mesh Traces",
IsPluginOriginated: true,
Schema: &schema,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import (

//go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
MeshTrafficPermissionResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -130,5 +132,4 @@ var MeshTrafficPermissionResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "Mesh Traffic Permission",
PluralDisplayName: "Mesh Traffic Permissions",
IsPluginOriginated: true,
Schema: &schema,
}
5 changes: 3 additions & 2 deletions tools/policy-gen/generator/cmd/core_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@ import (

//_DELETE_GO_EMBED_WORKAROUND_go:embed schema.yaml
var rawSchema []byte
var schema = spec.Schema{}

func init() {
var schema spec.Schema
if err := yaml.Unmarshal(rawSchema, &schema); err != nil {
panic(err)
}
rawSchema = nil
{{.Name}}ResourceTypeDescriptor.Schema = &schema
}

const (
Expand Down Expand Up @@ -170,6 +172,5 @@ var {{.Name}}ResourceTypeDescriptor = model.ResourceTypeDescriptor{
SingularDisplayName: "{{.SingularDisplayName}}",
PluralDisplayName: "{{.PluralDisplayName}}",
IsPluginOriginated: true,
Schema: &schema,
}
`))