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

chore: fix missing references in toOpts and changes with newlines #3240

Merged
merged 13 commits into from
Dec 9, 2024
Merged
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
35 changes: 35 additions & 0 deletions pkg/sdk/poc/example/to_opts_optional_example_def.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package example

import (
g "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/poc/generator"
)

//go:generate go run ../main.go

var ToOptsOptionalExample = g.NewInterface(
sfc-gh-jmichalak marked this conversation as resolved.
Show resolved Hide resolved
"ToOptsOptionalExamples",
"ToOptsOptionalExample",
g.KindOfT[DatabaseObjectIdentifier](),
).CreateOperation("https://example.com",
g.NewQueryStruct("Alter").
Alter().
IfExists().
Name(),
).AlterOperation("https://example.com",
g.NewQueryStruct("Alter").
Alter().
IfExists().
Name().
OptionalQueryStructField(
"OptionalField",
g.NewQueryStruct("OptionalField").
List("SomeList", "DatabaseObjectIdentifier", g.ListOptions()),
g.KeywordOptions(),
).
QueryStructField(
"RequiredField",
g.NewQueryStruct("RequiredField").
List("SomeRequiredList", "DatabaseObjectIdentifier", g.ListOptions().Required()),
g.KeywordOptions().Required(),
),
)
28 changes: 28 additions & 0 deletions pkg/sdk/poc/example/to_opts_optional_example_dto_gen.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package example

//go:generate go run ./dto-builder-generator/main.go

var (
_ optionsProvider[CreateToOptsOptionalExampleOptions] = new(CreateToOptsOptionalExampleRequest)
_ optionsProvider[AlterToOptsOptionalExampleOptions] = new(AlterToOptsOptionalExampleRequest)
)

type CreateToOptsOptionalExampleRequest struct {
IfExists *bool
name DatabaseObjectIdentifier // required
}

type AlterToOptsOptionalExampleRequest struct {
IfExists *bool
name DatabaseObjectIdentifier // required
OptionalField *OptionalFieldRequest
RequiredField RequiredFieldRequest // required
}

type OptionalFieldRequest struct {
SomeList []DatabaseObjectIdentifier
}

type RequiredFieldRequest struct {
SomeRequiredList []DatabaseObjectIdentifier // required
}
32 changes: 32 additions & 0 deletions pkg/sdk/poc/example/to_opts_optional_example_gen.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package example

import "context"

type ToOptsOptionalExamples interface {
Create(ctx context.Context, request *CreateToOptsOptionalExampleRequest) error
Alter(ctx context.Context, request *AlterToOptsOptionalExampleRequest) error
}

// CreateToOptsOptionalExampleOptions is based on https://example.com.
type CreateToOptsOptionalExampleOptions struct {
alter bool `ddl:"static" sql:"ALTER"`
IfExists *bool `ddl:"keyword" sql:"IF EXISTS"`
name DatabaseObjectIdentifier `ddl:"identifier"`
}

// AlterToOptsOptionalExampleOptions is based on https://example.com.
type AlterToOptsOptionalExampleOptions struct {
alter bool `ddl:"static" sql:"ALTER"`
IfExists *bool `ddl:"keyword" sql:"IF EXISTS"`
name DatabaseObjectIdentifier `ddl:"identifier"`
OptionalField *OptionalField `ddl:"keyword"`
RequiredField RequiredField `ddl:"keyword"`
}
sfc-gh-jcieslak marked this conversation as resolved.
Show resolved Hide resolved

type OptionalField struct {
SomeList []DatabaseObjectIdentifier `ddl:"list"`
}

type RequiredField struct {
SomeRequiredList []DatabaseObjectIdentifier `ddl:"list"`
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package example

import "testing"

func TestInt_ToOptsOptionalExamples(t *testing.T) {
// TODO: prepare common resources

t.Run("Create", func(t *testing.T) {
// TODO: fill me
})

t.Run("Alter", func(t *testing.T) {
// TODO: fill me
})
}
57 changes: 57 additions & 0 deletions pkg/sdk/poc/example/to_opts_optional_example_gen_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package example

import "testing"

func TestToOptsOptionalExamples_Create(t *testing.T) {
id := RandomDatabaseObjectIdentifier(t)
// Minimal valid CreateToOptsOptionalExampleOptions
defaultOpts := func() *CreateToOptsOptionalExampleOptions {
return &CreateToOptsOptionalExampleOptions{
name: id,
}
}

t.Run("validation: nil options", func(t *testing.T) {
var opts *CreateToOptsOptionalExampleOptions = nil
assertOptsInvalidJoinedErrors(t, opts, ErrNilOptions)
})

t.Run("basic", func(t *testing.T) {
opts := defaultOpts()
// TODO: fill me
assertOptsValidAndSQLEquals(t, opts, "TODO: fill me")
})

t.Run("all options", func(t *testing.T) {
opts := defaultOpts()
// TODO: fill me
assertOptsValidAndSQLEquals(t, opts, "TODO: fill me")
})
}

func TestToOptsOptionalExamples_Alter(t *testing.T) {
id := RandomDatabaseObjectIdentifier(t)
// Minimal valid AlterToOptsOptionalExampleOptions
defaultOpts := func() *AlterToOptsOptionalExampleOptions {
return &AlterToOptsOptionalExampleOptions{
name: id,
}
}

t.Run("validation: nil options", func(t *testing.T) {
var opts *AlterToOptsOptionalExampleOptions = nil
assertOptsInvalidJoinedErrors(t, opts, ErrNilOptions)
})

t.Run("basic", func(t *testing.T) {
opts := defaultOpts()
// TODO: fill me
assertOptsValidAndSQLEquals(t, opts, "TODO: fill me")
})

t.Run("all options", func(t *testing.T) {
opts := defaultOpts()
// TODO: fill me
assertOptsValidAndSQLEquals(t, opts, "TODO: fill me")
})
}
47 changes: 47 additions & 0 deletions pkg/sdk/poc/example/to_opts_optional_example_impl_gen.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package example

import (
"context"
)

var _ ToOptsOptionalExamples = (*toOptsOptionalExamples)(nil)

type toOptsOptionalExamples struct {
client *Client
}

func (v *toOptsOptionalExamples) Create(ctx context.Context, request *CreateToOptsOptionalExampleRequest) error {
opts := request.toOpts()
return validateAndExec(v.client, ctx, opts)
}

func (v *toOptsOptionalExamples) Alter(ctx context.Context, request *AlterToOptsOptionalExampleRequest) error {
opts := request.toOpts()
return validateAndExec(v.client, ctx, opts)
}

func (r *CreateToOptsOptionalExampleRequest) toOpts() *CreateToOptsOptionalExampleOptions {
opts := &CreateToOptsOptionalExampleOptions{
IfExists: r.IfExists,
name: r.name,
}
return opts
}

func (r *AlterToOptsOptionalExampleRequest) toOpts() *AlterToOptsOptionalExampleOptions {
opts := &AlterToOptsOptionalExampleOptions{
IfExists: r.IfExists,
name: r.name,
}

if r.OptionalField != nil {
opts.OptionalField = &OptionalField{
SomeList: r.OptionalField.SomeList,
}
}
opts.RequiredField = RequiredField{
SomeRequiredList: r.RequiredField.SomeRequiredList,
}

return opts
}
24 changes: 24 additions & 0 deletions pkg/sdk/poc/example/to_opts_optional_example_validations_gen.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package example

import "errors"

var (
_ validatable = new(CreateToOptsOptionalExampleOptions)
_ validatable = new(AlterToOptsOptionalExampleOptions)
)

func (opts *CreateToOptsOptionalExampleOptions) validate() error {
if opts == nil {
return ErrNilOptions
}
var errs []error
return errors.Join(errs...)
}

func (opts *AlterToOptsOptionalExampleOptions) validate() error {
if opts == nil {
return ErrNilOptions
}
var errs []error
return errors.Join(errs...)
}
1 change: 1 addition & 0 deletions pkg/sdk/poc/generator/templates/operation_struct.tmpl
Original file line number Diff line number Diff line change
@@ -6,3 +6,4 @@ type {{ .OptsField.KindNoPtr }} struct {
{{ .Name }} {{ .Kind }} {{ .TagsPrintable }}
{{- end }}
}

1 change: 1 addition & 0 deletions pkg/sdk/poc/generator/templates/struct.tmpl
Original file line number Diff line number Diff line change
@@ -5,3 +5,4 @@ type {{ .KindNoPtr }} struct {
{{ .Name }} {{ .Kind }} {{ .TagsPrintable }}
{{- end }}
}

Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@
if r{{ .Path }} != nil {
{{ end }}

{{- if not .IsSlice }}
opts{{ .Path }} = {{ template "toOptsMapping" . -}}{{/* Recursive call */}}
{{- if not .IsSlice -}}
opts{{ .Path }} = {{ if .IsPointer }}&{{end}}{{ template "toOptsMapping" . -}}{{/* Recursive call */}}
{{- else }}
s := make({{ .Kind }}, len(r{{ .Path }}))
for i, v := range r{{ .Path }} {
@@ -28,9 +28,9 @@
opts{{ .Path }} = s
{{ end -}}

{{ if or .IsPointer .IsSlice }}
{{ if or .IsPointer .IsSlice -}}
}
{{ end }}
{{- end -}}
{{- end -}}
{{ end -}}
{{ end }}
1 change: 1 addition & 0 deletions pkg/sdk/poc/main.go
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ import (

var definitionMapping = map[string]*generator.Interface{
"database_role_def.go": example.DatabaseRole,
"to_opts_optional_example_def.go": example.ToOptsOptionalExample,
"network_policies_def.go": sdk.NetworkPoliciesDef,
"session_policies_def.go": sdk.SessionPoliciesDef,
"tasks_def.go": sdk.TasksDef,