Skip to content

fix: Unify plugin package structure #1735

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

Merged
disq merged 2 commits into from
Sep 6, 2022
Merged

fix: Unify plugin package structure #1735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35bab74
fix: Unify plugin package structure
disq Sep 5, 2022
8301836
terraform plugin: Fix import cycle in test
disq Sep 5, 2022
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
2 changes: 1 addition & 1 deletion plugins/source/heroku/docs/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"path"

"github.com/cloudquery/cloudquery/plugins/source/heroku/provider"
"github.com/cloudquery/cloudquery/plugins/source/heroku/resources/provider"
"github.com/cloudquery/cq-provider-sdk/provider/docs"
)

Expand Down
2 changes: 1 addition & 1 deletion plugins/source/heroku/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/cloudquery/cloudquery/plugins/source/heroku/provider"
"github.com/cloudquery/cloudquery/plugins/source/heroku/resources/provider"
"github.com/cloudquery/cq-provider-sdk/serve"
)

Expand Down
0 plugins/source/heroku/provider/provider.go → ...rce/heroku/resources/provider/provider.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions plugins/source/okta/docs/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package main
import (
"log"

"github.com/cloudquery/cloudquery/plugins/source/okta/resources"
"github.com/cloudquery/cloudquery/plugins/source/okta/resources/provider"
"github.com/cloudquery/cq-provider-sdk/provider/docs"
)

func main() {
err := docs.GenerateDocs(resources.Provider(), "./docs", true)
err := docs.GenerateDocs(provider.Provider(), "./docs", true)
if err != nil {
log.Fatalf("Failed to geneerate docs: %s", err)
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/source/okta/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package main

import (
"github.com/cloudquery/cloudquery/plugins/source/okta/resources"
"github.com/cloudquery/cloudquery/plugins/source/okta/resources/provider"
"github.com/cloudquery/cq-provider-sdk/serve"
)

func main() {
serve.Serve(&serve.Options{
Name: "okta",
Provider: resources.Provider(),
Provider: provider.Provider(),
Logger: nil,
NoLogOutputOverride: false,
})
Expand Down
5 changes: 3 additions & 2 deletions plugins/source/okta/resources/provider.go → ...ource/okta/resources/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package resources
package provider

import (
"github.com/cloudquery/cloudquery/plugins/source/okta/client"
"github.com/cloudquery/cloudquery/plugins/source/okta/resources"
"github.com/cloudquery/cq-provider-sdk/provider"
"github.com/cloudquery/cq-provider-sdk/provider/schema"
)
Expand All @@ -16,7 +17,7 @@ func Provider() *provider.Provider {
Version: Version,
Configure: client.Configure,
ResourceMap: map[string]*schema.Table{
"users": Users(),
"users": resources.Users(),
},
Config: func() provider.Config {
return &client.Config{}
Expand Down
4 changes: 2 additions & 2 deletions plugins/source/terraform/docs/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"fmt"
"os"

"github.com/cloudquery/cloudquery/plugins/source/terraform/resources"
"github.com/cloudquery/cloudquery/plugins/source/terraform/resources/provider"
"github.com/cloudquery/cq-provider-sdk/provider/docs"
)

func main() {
err := docs.GenerateDocs(resources.Provider(), "./docs", true)
err := docs.GenerateDocs(provider.Provider(), "./docs", true)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to generate docs: %s\n", err)
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/source/terraform/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package main

import (
"github.com/cloudquery/cloudquery/plugins/source/terraform/resources"
"github.com/cloudquery/cloudquery/plugins/source/terraform/resources/provider"
"github.com/cloudquery/cq-provider-sdk/serve"
)

func main() {
serve.Serve(&serve.Options{
Name: "terraform",
Provider: resources.Provider(),
Provider: provider.Provider(),
})
}
5 changes: 3 additions & 2 deletions ...ns/source/terraform/resources/provider.go → .../terraform/resources/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package resources
package provider

import (
"github.com/cloudquery/cloudquery/plugins/source/terraform/client"
"github.com/cloudquery/cloudquery/plugins/source/terraform/resources"
"github.com/cloudquery/cq-provider-sdk/provider"
"github.com/cloudquery/cq-provider-sdk/provider/schema"
)
Expand All @@ -16,7 +17,7 @@ func Provider() *provider.Provider {
Version: Version,
Configure: client.Configure,
ResourceMap: map[string]*schema.Table{
"tf.data": TFData(),
"tf.data": resources.TFData(),
},
Config: func() provider.Config {
return &client.Config{}
Expand Down
5 changes: 3 additions & 2 deletions plugins/source/terraform/resources/tfdata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package resources
package resources_test

import (
"testing"

"github.com/cloudquery/cloudquery/plugins/source/terraform/resources/provider"
providertest "github.com/cloudquery/cq-provider-sdk/provider/testing"
)

Expand All @@ -15,7 +16,7 @@ func TestTfData(t *testing.T) {
`

providertest.TestResource(t, providertest.ResourceTestCase{
Provider: Provider(),
Provider: provider.Provider(),
Config: cfg,
})
}