Skip to content

Commit

Permalink
fix!: Rename domains c_name to cname (#2635)
Browse files Browse the repository at this point in the history
#### Summary

Related to #2189.

1. Added codegen drift detection
2. Moved generated resources under `../resources/services` for
consistency with other plugins (there's a follow up here to put each
namespace in a separate directory, but didn't want to do too many
changes)
3. Moved `plugin/plugin.go` to `resources/plugin/plugin.go`. This is
required so Go Releaser embeds the correct version of the plugin during
release, see
https://github.com/cloudquery/cloudquery/blob/6ab042925afaf7fe0a7fccbedd17f0915d40f7cf/plugins/.goreleaser.yaml#L12
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
erezrokah committed Oct 11, 2022
1 parent d194943 commit 70ff2dc
Show file tree
Hide file tree
Showing 118 changed files with 199 additions and 191 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/source_heroku.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ jobs:
run: make gen-docs
- name: Fail if docs are changed
run: test "$(git status -s ./docs/tables | wc -l)" -eq 0
- name: gen-code
run: make gen-code
- name: Fail if code generation changed services
run: test "$(git status -s ./resources/services | wc -l)" -eq 0
4 changes: 4 additions & 0 deletions plugins/source/heroku/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ gen-docs:
.PHONY: lint
lint:
golangci-lint run

.PHONY: gen-code
gen-code:
go run codegen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"runtime"
"text/template"

"github.com/cloudquery/cloudquery/plugins/source/heroku/codegenmain/recipes"
"github.com/cloudquery/cloudquery/plugins/source/heroku/codegen/recipes"
sdkgen "github.com/cloudquery/plugin-sdk/codegen"
"github.com/iancoleman/strcase"
"github.com/jinzhu/inflection"
Expand All @@ -36,7 +36,7 @@ func clearServicesDirectory() {
log.Fatal("Failed to get caller information")
}
dir := path.Dir(filename)
filePath := path.Join(dir, "../codegen")
filePath := path.Join(dir, "../resources/services")
err := clearDirectory(filePath)
if err != nil {
log.Fatal(fmt.Errorf("failed to clear services directory: %w", err))
Expand Down Expand Up @@ -104,7 +104,7 @@ func generateResource(r recipes.Resource, mock bool) {
if err := tpl.Execute(&buff, r); err != nil {
log.Fatal(fmt.Errorf("failed to execute template: %w", err))
}
filePath := path.Join(dir, "../codegen")
filePath := path.Join(dir, "../resources/services")
fileName := strcase.ToSnake(r.HerokuStructName)
if mock {
filePath = path.Join(filePath, fileName+"_mock_test.go")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Code generated by codegen; DO NOT EDIT.

package codegen
package services

import (
"context"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Code generated by codegen; DO NOT EDIT.

package codegen
package services

import (
"encoding/json"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Code generated by codegen; DO NOT EDIT.

package codegen
package services

import (
"context"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Code generated by codegen; DO NOT EDIT.

package codegen
package services

import (
"encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion plugins/source/heroku/docs/tables/heroku_domains.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The primary key for this table is **id**.
|acm_status|String|
|acm_status_reason|String|
|app|JSON|
|c_name|String|
|cname|String|
|created_at|Timestamp|
|hostname|String|
|id (PK)|String|
Expand Down
2 changes: 1 addition & 1 deletion plugins/source/heroku/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

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

Expand Down
75 changes: 0 additions & 75 deletions plugins/source/heroku/plugin/plugin.go

This file was deleted.

75 changes: 75 additions & 0 deletions plugins/source/heroku/resources/plugin/plugin.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
package plugin

import (
"github.com/cloudquery/cloudquery/plugins/source/heroku/client"
"github.com/cloudquery/cloudquery/plugins/source/heroku/resources/services"
"github.com/cloudquery/plugin-sdk/plugins"
"github.com/cloudquery/plugin-sdk/schema"
)

var (
Version = "development"
)

func Plugin() *plugins.SourcePlugin {
return plugins.NewSourcePlugin(
"heroku",
Version,
[]*schema.Table{
services.AccountFeatures(),
services.AddOns(),
services.AddOnAttachments(),
services.AddOnConfigs(),
services.AddOnRegionCapabilities(),
services.AddOnServices(),
services.AddOnWebhooks(),
services.AddOnWebhookDeliveries(),
services.AddOnWebhookEvents(),
services.Apps(),
services.AppFeatures(),
services.AppTransfers(),
services.AppWebhooks(),
services.AppWebhookDeliveries(),
services.AppWebhookEvents(),
services.Builds(),
services.BuildpackInstallations(),
services.Collaborators(),
services.Credits(),
services.Domains(),
services.Dynos(),
services.DynoSizes(),
services.EnterpriseAccounts(),
services.EnterpriseAccountMembers(),
services.Formations(),
services.InboundRulesets(),
services.Invoices(),
services.Keys(),
services.LogDrains(),
services.OAuthAuthorizations(),
services.OAuthClients(),
services.OutboundRulesets(),
services.Peerings(),
services.PermissionEntities(),
services.Pipelines(),
services.PipelineBuilds(),
services.PipelineCouplings(),
services.PipelineDeployments(),
services.PipelineReleases(),
services.Regions(),
services.Releases(),
services.ReviewApps(),
services.Spaces(),
services.SpaceAppAccesses(),
services.Stacks(),
services.TeamAppPermissions(),
services.TeamFeatures(),
services.Teams(),
services.TeamInvitations(),
services.TeamInvoices(),
services.TeamMembers(),
services.TeamSpaces(),
services.VPNConnections(),
},
client.Configure,
)
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 70ff2dc

Please sign in to comment.