Skip to content

Commit 7f1c6be

Browse files
feat(tf/generate): support generating auth0_organization_discovery_domains resources (#1349)
* build: update generate command for user mock * feat(tf/generate): support generating auth0_organization_discovery_domain resources --------- Co-authored-by: ramya18101 <anusriankisetty@gmail.com> Co-authored-by: Ramya Anusri <62586490+ramya18101@users.noreply.github.com>
1 parent f6541d5 commit 7f1c6be

8 files changed

Lines changed: 157 additions & 5 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/AlecAivazis/survey/v2 v2.3.7
77
github.com/PuerkitoBio/rehttp v1.4.0
88
github.com/atotto/clipboard v0.1.4
9-
github.com/auth0/go-auth0 v1.30.0
9+
github.com/auth0/go-auth0 v1.31.0
1010
github.com/briandowns/spinner v1.23.2
1111
github.com/charmbracelet/glamour v0.10.0
1212
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew
2222
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
2323
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
2424
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
25-
github.com/auth0/go-auth0 v1.30.0 h1:LZUWkvhyvaqzRYjP+mywc3141cP7bI6EsjaUX0t+mcw=
26-
github.com/auth0/go-auth0 v1.30.0/go.mod h1:32sQB1uAn+99fJo6N819EniKq8h785p0ag0lMWhiTaE=
25+
github.com/auth0/go-auth0 v1.31.0 h1:F0OMq6yRus8vCsrd1VF6zhGAWEg+ZSjRQexKK1cxqUQ=
26+
github.com/auth0/go-auth0 v1.31.0/go.mod h1:32sQB1uAn+99fJo6N819EniKq8h785p0ag0lMWhiTaE=
2727
github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0 h1:0NmehRCgyk5rljDQLKUO+cRJCnduDyn11+zGZIc9Z48=
2828
github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0/go.mod h1:6L7zgvqo0idzI7IO8de6ZC051AfXb5ipkIJ7bIA2tGA=
2929
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=

internal/auth0/mock/organization_mock.go

Lines changed: 97 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/auth0/organization.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,19 @@ type OrganizationAPI interface {
4848
//
4949
// See: https://auth0.com/docs/api/management/v2/#!/Organizations/get_enabled_connections
5050
Connections(ctx context.Context, id string, opts ...management.RequestOption) (c *management.OrganizationConnectionList, err error)
51+
52+
// DiscoveryDomains retrieves the discovery domains for an organization.
53+
DiscoveryDomains(ctx context.Context, id string, opts ...management.RequestOption) (d *management.DiscoveryDomainList, err error)
54+
55+
// CreateDiscoveryDomain creates a discovery domain for an organization.
56+
CreateDiscoveryDomain(ctx context.Context, id string, d *management.OrganizationDiscoveryDomain, opts ...management.RequestOption) (err error)
57+
58+
// DiscoveryDomain retrieves a specific discovery domain for an organization.
59+
DiscoveryDomain(ctx context.Context, id string, domainID string, opts ...management.RequestOption) (d *management.OrganizationDiscoveryDomain, err error)
60+
61+
// DeleteDiscoveryDomain deletes a specific discovery domain from an organization.
62+
DeleteDiscoveryDomain(ctx context.Context, id string, domainID string, opts ...management.RequestOption) (err error)
63+
64+
// UpdateDiscoveryDomain updates a specific discovery domain for an organization.
65+
UpdateDiscoveryDomain(ctx context.Context, id string, domainID string, d *management.OrganizationDiscoveryDomain, opts ...management.RequestOption) (err error)
5166
}

internal/auth0/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:generate mockgen -source=user.go -destination=mock/user.go -package=mock
1+
//go:generate mockgen -source=user.go -destination=mock/user_mock.go -package=mock
22

33
package auth0
44

internal/cli/terraform.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (i *terraformInputs) parseResourceFetchers(api *auth0.API) ([]resourceDataF
9999
fetchers = append(fetchers, &guardianResourceFetcher{})
100100
case "auth0_log_stream":
101101
fetchers = append(fetchers, &logStreamResourceFetcher{api})
102-
case "auth0_organization", "auth0_organization_connections":
102+
case "auth0_organization", "auth0_organization_connections", "auth0_organization_discovery_domains":
103103
fetchers = append(fetchers, &organizationResourceFetcher{api})
104104
case "auth0_network_acl":
105105
fetchers = append(fetchers, &networkACLResourceFetcher{api})

internal/cli/terraform_fetcher.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,17 @@ func (f *organizationResourceFetcher) FetchData(ctx context.Context) (importData
476476
ImportID: organization.GetID(),
477477
})
478478
}
479+
480+
discoveryDomains, err := f.api.Organization.DiscoveryDomains(ctx, organization.GetID())
481+
if err != nil {
482+
return data, err
483+
}
484+
if len(discoveryDomains.Domains) > 0 {
485+
data = append(data, importDataItem{
486+
ResourceName: "auth0_organization_discovery_domains." + sanitizeResourceName(organization.GetName()),
487+
ImportID: organization.GetID(),
488+
})
489+
}
479490
}
480491

481492
return data, nil

internal/cli/terraform_fetcher_test.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,6 +1477,19 @@ func TestOrganizationResourceFetcher_FetchData(t *testing.T) {
14771477
nil,
14781478
)
14791479

1480+
orgAPI.EXPECT().
1481+
DiscoveryDomains(gomock.Any(), gomock.Any()).
1482+
Return(
1483+
&management.DiscoveryDomainList{
1484+
Domains: []*management.OrganizationDiscoveryDomain{
1485+
{
1486+
Domain: auth0.String("example.com"),
1487+
},
1488+
},
1489+
},
1490+
nil,
1491+
).Times(4)
1492+
14801493
fetcher := organizationResourceFetcher{
14811494
api: &auth0.API{
14821495
Organization: orgAPI,
@@ -1492,6 +1505,10 @@ func TestOrganizationResourceFetcher_FetchData(t *testing.T) {
14921505
ResourceName: "auth0_organization_connections.organization_1",
14931506
ImportID: "org_1",
14941507
},
1508+
{
1509+
ResourceName: "auth0_organization_discovery_domains.organization_1",
1510+
ImportID: "org_1",
1511+
},
14951512
{
14961513
ResourceName: "auth0_organization.organization_2",
14971514
ImportID: "org_2",
@@ -1500,6 +1517,10 @@ func TestOrganizationResourceFetcher_FetchData(t *testing.T) {
15001517
ResourceName: "auth0_organization_connections.organization_2",
15011518
ImportID: "org_2",
15021519
},
1520+
{
1521+
ResourceName: "auth0_organization_discovery_domains.organization_2",
1522+
ImportID: "org_2",
1523+
},
15031524
{
15041525
ResourceName: "auth0_organization.organization_3",
15051526
ImportID: "org_3",
@@ -1508,10 +1529,18 @@ func TestOrganizationResourceFetcher_FetchData(t *testing.T) {
15081529
ResourceName: "auth0_organization_connections.organization_3",
15091530
ImportID: "org_3",
15101531
},
1532+
{
1533+
ResourceName: "auth0_organization_discovery_domains.organization_3",
1534+
ImportID: "org_3",
1535+
},
15111536
{
15121537
ResourceName: "auth0_organization.organization_4_no_connections",
15131538
ImportID: "org_4",
15141539
},
1540+
{
1541+
ResourceName: "auth0_organization_discovery_domains.organization_4_no_connections",
1542+
ImportID: "org_4",
1543+
},
15151544
}
15161545

15171546
data, err := fetcher.FetchData(context.Background())

0 commit comments

Comments
 (0)