Skip to content
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/PuerkitoBio/rehttp v1.4.0
github.com/atotto/clipboard v0.1.4
github.com/auth0/go-auth0 v1.30.0
github.com/auth0/go-auth0 v1.31.0
github.com/briandowns/spinner v1.23.2
github.com/charmbracelet/glamour v0.10.0
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/auth0/go-auth0 v1.30.0 h1:LZUWkvhyvaqzRYjP+mywc3141cP7bI6EsjaUX0t+mcw=
github.com/auth0/go-auth0 v1.30.0/go.mod h1:32sQB1uAn+99fJo6N819EniKq8h785p0ag0lMWhiTaE=
github.com/auth0/go-auth0 v1.31.0 h1:F0OMq6yRus8vCsrd1VF6zhGAWEg+ZSjRQexKK1cxqUQ=
github.com/auth0/go-auth0 v1.31.0/go.mod h1:32sQB1uAn+99fJo6N819EniKq8h785p0ag0lMWhiTaE=
github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0 h1:0NmehRCgyk5rljDQLKUO+cRJCnduDyn11+zGZIc9Z48=
github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0/go.mod h1:6L7zgvqo0idzI7IO8de6ZC051AfXb5ipkIJ7bIA2tGA=
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
Expand Down
97 changes: 97 additions & 0 deletions internal/auth0/mock/organization_mock.go

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

15 changes: 15 additions & 0 deletions internal/auth0/organization.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,19 @@ type OrganizationAPI interface {
//
// See: https://auth0.com/docs/api/management/v2/#!/Organizations/get_enabled_connections
Connections(ctx context.Context, id string, opts ...management.RequestOption) (c *management.OrganizationConnectionList, err error)

// DiscoveryDomains retrieves the discovery domains for an organization.
DiscoveryDomains(ctx context.Context, id string, opts ...management.RequestOption) (d *management.DiscoveryDomainList, err error)

// CreateDiscoveryDomain creates a discovery domain for an organization.
CreateDiscoveryDomain(ctx context.Context, id string, d *management.OrganizationDiscoveryDomain, opts ...management.RequestOption) (err error)

// DiscoveryDomain retrieves a specific discovery domain for an organization.
DiscoveryDomain(ctx context.Context, id string, domainID string, opts ...management.RequestOption) (d *management.OrganizationDiscoveryDomain, err error)

// DeleteDiscoveryDomain deletes a specific discovery domain from an organization.
DeleteDiscoveryDomain(ctx context.Context, id string, domainID string, opts ...management.RequestOption) (err error)

// UpdateDiscoveryDomain updates a specific discovery domain for an organization.
UpdateDiscoveryDomain(ctx context.Context, id string, domainID string, d *management.OrganizationDiscoveryDomain, opts ...management.RequestOption) (err error)
}
2 changes: 1 addition & 1 deletion internal/auth0/user.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:generate mockgen -source=user.go -destination=mock/user.go -package=mock
//go:generate mockgen -source=user.go -destination=mock/user_mock.go -package=mock

package auth0

Expand Down
2 changes: 1 addition & 1 deletion internal/cli/terraform.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (i *terraformInputs) parseResourceFetchers(api *auth0.API) ([]resourceDataF
fetchers = append(fetchers, &guardianResourceFetcher{})
case "auth0_log_stream":
fetchers = append(fetchers, &logStreamResourceFetcher{api})
case "auth0_organization", "auth0_organization_connections":
case "auth0_organization", "auth0_organization_connections", "auth0_organization_discovery_domains":
fetchers = append(fetchers, &organizationResourceFetcher{api})
case "auth0_network_acl":
fetchers = append(fetchers, &networkACLResourceFetcher{api})
Expand Down
11 changes: 11 additions & 0 deletions internal/cli/terraform_fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,17 @@ func (f *organizationResourceFetcher) FetchData(ctx context.Context) (importData
ImportID: organization.GetID(),
})
}

discoveryDomains, err := f.api.Organization.DiscoveryDomains(ctx, organization.GetID())
if err != nil {
return data, err
}
if len(discoveryDomains.Domains) > 0 {
data = append(data, importDataItem{
ResourceName: "auth0_organization_discovery_domains." + sanitizeResourceName(organization.GetName()),
ImportID: organization.GetID(),
})
}
}

return data, nil
Expand Down
29 changes: 29 additions & 0 deletions internal/cli/terraform_fetcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1477,6 +1477,19 @@ func TestOrganizationResourceFetcher_FetchData(t *testing.T) {
nil,
)

orgAPI.EXPECT().
DiscoveryDomains(gomock.Any(), gomock.Any()).
Return(
&management.DiscoveryDomainList{
Domains: []*management.OrganizationDiscoveryDomain{
{
Domain: auth0.String("example.com"),
},
},
},
nil,
).Times(4)

fetcher := organizationResourceFetcher{
api: &auth0.API{
Organization: orgAPI,
Expand All @@ -1492,6 +1505,10 @@ func TestOrganizationResourceFetcher_FetchData(t *testing.T) {
ResourceName: "auth0_organization_connections.organization_1",
ImportID: "org_1",
},
{
ResourceName: "auth0_organization_discovery_domains.organization_1",
ImportID: "org_1",
},
{
ResourceName: "auth0_organization.organization_2",
ImportID: "org_2",
Expand All @@ -1500,6 +1517,10 @@ func TestOrganizationResourceFetcher_FetchData(t *testing.T) {
ResourceName: "auth0_organization_connections.organization_2",
ImportID: "org_2",
},
{
ResourceName: "auth0_organization_discovery_domains.organization_2",
ImportID: "org_2",
},
{
ResourceName: "auth0_organization.organization_3",
ImportID: "org_3",
Expand All @@ -1508,10 +1529,18 @@ func TestOrganizationResourceFetcher_FetchData(t *testing.T) {
ResourceName: "auth0_organization_connections.organization_3",
ImportID: "org_3",
},
{
ResourceName: "auth0_organization_discovery_domains.organization_3",
ImportID: "org_3",
},
{
ResourceName: "auth0_organization.organization_4_no_connections",
ImportID: "org_4",
},
{
ResourceName: "auth0_organization_discovery_domains.organization_4_no_connections",
ImportID: "org_4",
},
}

data, err := fetcher.FetchData(context.Background())
Expand Down
Loading