Skip to content

Commit

Permalink
costradar_account -> costradar_aws_account
Browse files Browse the repository at this point in the history
  • Loading branch information
@ludaciti
ludaciti committed Feb 14, 2022
1 parent d91c3c1 commit 761341d
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 55 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TEST?=$$(go list ./... | grep -v 'vendor')
NAME=costradar
BINARY=terraform-provider-${NAME}_${VERSION}
VERSION=0.1.11
VERSION=0.1.12
HOSTNAME=localhost
NAMESPACE=local
GOARCH = amd64
Expand Down
2 changes: 1 addition & 1 deletion examples/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
costradar = {
version = "0.1.11"
version = "0.1.12"
source = "localhost/local/costradar"
}
}
Expand Down
33 changes: 16 additions & 17 deletions internal/provider/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@ type Client interface {
UpdateUserIdentitySet(userId string, setId string, identitySet []UserIdentitySetItem) (*UserIdentitySetPayload, error)
DeleteUserIdentitySet(userId string, setId string) error

GetAccount(id string) (*AccountPayload, error)
CreateAccount(account Account) (*AccountPayload, error)
UpdateAccount(account Account) (*AccountPayload, error)
DeleteAccount(id string) error
GetAwsAccount(id string) (*AccountPayload, error)
CreateAwsAccount(account Account) (*AccountPayload, error)
UpdateAwsAccount(account Account) (*AccountPayload, error)
DeleteAwsAccount(id string) error

GetTenant() (*TenantPayload, error)
UpdateTenant(tenant Tenant) (*TenantPayload, error)
Expand Down Expand Up @@ -924,14 +924,13 @@ func (c *ClientGraphql) DeleteUserIdentitySet(userId string, setId string) error

// ------------------------------------------------------------------------------------------

func (c *ClientGraphql) GetAccount(id string) (*AccountPayload, error) {
query := GetAccountQuery

func (c *ClientGraphql) GetAwsAccount(id string) (*AccountPayload, error) {
query := GetAwsAccountQuery
variables := map[string]interface{}{
"id": id,
}

data, err := c.graphql(query, variables, "data.getAccount")
data, err := c.graphql(query, variables, "data.awsGetAccount")
if err != nil {
return nil, err
}
Expand All @@ -942,8 +941,8 @@ func (c *ClientGraphql) GetAccount(id string) (*AccountPayload, error) {
return &payload, err
}

func (c *ClientGraphql) CreateAccount(account Account) (*AccountPayload, error) {
query := CreateAccountQuery
func (c *ClientGraphql) CreateAwsAccount(account Account) (*AccountPayload, error) {
query := CreateAwsAccountQuery
variables := map[string]interface{}{
"accountId": account.AccountId,
"alias": account.Alias,
Expand All @@ -952,7 +951,7 @@ func (c *ClientGraphql) CreateAccount(account Account) (*AccountPayload, error)
"tags": account.Tags,
}

data, err := c.graphql(query, variables, "data.createAccount")
data, err := c.graphql(query, variables, "data.awsCreateAccount")
if err != nil {
return nil, err
}
Expand All @@ -962,8 +961,8 @@ func (c *ClientGraphql) CreateAccount(account Account) (*AccountPayload, error)
return &payload, err
}

func (c *ClientGraphql) UpdateAccount(account Account) (*AccountPayload, error) {
query := UpdateAccountQuery
func (c *ClientGraphql) UpdateAwsAccount(account Account) (*AccountPayload, error) {
query := UpdateAwsAccountQuery
variables := map[string]interface{}{
"id": account.ID,
"alias": account.Alias,
Expand All @@ -972,7 +971,7 @@ func (c *ClientGraphql) UpdateAccount(account Account) (*AccountPayload, error)
"tags": account.Tags,
}

data, err := c.graphql(query, variables, "data.updateAccount")
data, err := c.graphql(query, variables, "data.awsUpdateAccount")

if err != nil {
return nil, err
Expand All @@ -982,13 +981,13 @@ func (c *ClientGraphql) UpdateAccount(account Account) (*AccountPayload, error)
return &payload, err
}

func (c *ClientGraphql) DeleteAccount(id string) error {
query := DeleteAccountQuery
func (c *ClientGraphql) DeleteAwsAccount(id string) error {
query := DeleteAwsAccountQuery
variables := map[string]interface{}{
"id": id,
}

_, err := c.graphql(query, variables, "data.deleteAccount")
_, err := c.graphql(query, variables, "data.awsDeleteAccount")
return err
}

Expand Down
2 changes: 1 addition & 1 deletion internal/provider/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func Provider() *schema.Provider {
"costradar_team_member_set": resourceTeamMemberSet(),
"costradar_user": resourceUser(),
"costradar_user_identity_set": resourceUserIdentitySet(),
"costradar_account": resourceAccount(),
"costradar_aws_account": resourceAwsAccount(),
//"costradar_tenant": resourceTenant(),
},
DataSourcesMap: map[string]*schema.Resource{
Expand Down
20 changes: 10 additions & 10 deletions internal/provider/queries.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,9 +804,9 @@ mutation ($userId: String!, $setId: String!) {
}
`

var GetAccountQuery = `
var GetAwsAccountQuery = `
query ($id: String!){
getAccount(id: $id){
awsGetAccount(id: $id){
result {
id
accountId
Expand All @@ -826,15 +826,15 @@ query ($id: String!){
}
`

var CreateAccountQuery = `
var CreateAwsAccountQuery = `
mutation (
$accountId: String!,
$alias: String!
$owners: [String!]
$accessConfig: AccessConfigInput!
$accessConfig: AWSAccessConfigInput!
$tags: JSON
){
createAccount(
awsCreateAccount(
accountId: $accountId,
input: {
alias: $alias
Expand All @@ -860,15 +860,15 @@ mutation (
}
`

var UpdateAccountQuery = `
var UpdateAwsAccountQuery = `
mutation (
$id: String!
$alias: String!
$owners: [String!]
$accessConfig: AccessConfigInput!
$accessConfig: AWSAccessConfigInput!
$tags: JSON
){
updateAccount(
awsUpdateAccount(
id: $id,
input: {
alias: $alias
Expand All @@ -894,9 +894,9 @@ mutation (
}
`

var DeleteAccountQuery = `
var DeleteAwsAccountQuery = `
mutation ($id: String!) {
deleteAccount(id: $id){
awsDeleteAccount(id: $id){
result {
id
accountId
Expand Down
44 changes: 22 additions & 22 deletions internal/provider/resource_account.go → internal/provider/resource_aws_account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

var resourceAccountSchema = map[string]*schema.Schema{
var resourceAwsAccountSchema = map[string]*schema.Schema{
"id": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -62,20 +62,20 @@ var resourceAccountSchema = map[string]*schema.Schema{
},
}

func resourceAccount() *schema.Resource {
func resourceAwsAccount() *schema.Resource {
return &schema.Resource{
CreateContext: resourceAccountCreate,
ReadContext: resourceAccountRead,
UpdateContext: resourceAccountUpdate,
DeleteContext: resourceAccountDelete,
CreateContext: resourceAwsAccountCreate,
ReadContext: resourceAwsAccountRead,
UpdateContext: resourceAwsAccountUpdate,
DeleteContext: resourceAwsAccountDelete,
Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},
Schema: resourceAccountSchema,
Schema: resourceAwsAccountSchema,
}
}

func accountFromResourceData(d *schema.ResourceData) Account {
func accountAwsFromResourceData(d *schema.ResourceData) Account {
var accessConfig AccessConfig
accessConfigData := d.Get("access_config.0").(map[string]interface{})
if v, ok := accessConfigData["reader_mode"].(string); ok {
Expand All @@ -102,7 +102,7 @@ func accountFromResourceData(d *schema.ResourceData) Account {
return account
}

func accountToResourceData(d *schema.ResourceData, a Account) {
func awsAccountToResourceData(d *schema.ResourceData, a Account) {
var accessConfigList []map[string]string
accessConfig := make(map[string]string)
accessConfig["reader_mode"] = a.AccessConfig.ReaderMode
Expand All @@ -117,53 +117,53 @@ func accountToResourceData(d *schema.ResourceData, a Account) {
d.Set("tags", a.Tags)
}

func resourceAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
func resourceAwsAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
c := m.(Client)

var diags diag.Diagnostics

id := d.Id()
account, err := c.GetAccount(id)
account, err := c.GetAwsAccount(id)
if err != nil {
return diag.FromErr(err)
}
accountToResourceData(d, account.Payload)
awsAccountToResourceData(d, account.Payload)
return diags
}

func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
func resourceAwsAccountCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
c := m.(Client)

var diags diag.Diagnostics

account := accountFromResourceData(d)
account := accountAwsFromResourceData(d)

a, err := c.CreateAccount(account)
a, err := c.CreateAwsAccount(account)
if err != nil {
return diag.FromErr(err)
}
d.SetId(a.Payload.ID)
resourceAccountRead(ctx, d, m)
resourceAwsAccountRead(ctx, d, m)
return diags
}

func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
account := accountFromResourceData(d)
func resourceAwsAccountUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
account := accountAwsFromResourceData(d)
c := m.(Client)
_, err := c.UpdateAccount(account)
_, err := c.UpdateAwsAccount(account)
if err != nil {
return diag.FromErr(err)
}
return resourceAccountRead(ctx, d, m)
return resourceAwsAccountRead(ctx, d, m)
}

func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
func resourceAwsAccountDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
c := m.(Client)
var diags diag.Diagnostics

id := d.Id()

err := c.DeleteAccount(id)
err := c.DeleteAwsAccount(id)
if err != nil {
return diag.FromErr(err)
}
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/resource_account_test.go → ...nal/provider/resource_aws_account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
func TestAccAccount(t *testing.T) {
os.Setenv("COSTRADAR_TOKEN", "api_xyz_costradar")
os.Setenv("COSTRADAR_ENDPOINT", "http://localhost:8000/graphql")
resourceName := "costradar_account.test"
resourceName := "costradar_aws_account.test"
resource.Test(t, resource.TestCase{
ProviderFactories: map[string]func() (*schema.Provider, error){
"costradar": func() (*schema.Provider, error) {
Expand Down Expand Up @@ -55,7 +55,7 @@ func TestAccAccount(t *testing.T) {

func testAccAccountTF() string {
return `
resource "costradar_account" "test" {
resource "costradar_aws_account" "test" {
account_id = "123:123"
alias = "Alias"
owners = [
Expand All @@ -74,7 +74,7 @@ func testAccAccountTF() string {

func testAccAccountUpdateTF() string {
return `
resource "costradar_account" "test" {
resource "costradar_aws_account" "test" {
account_id = "123:123"
alias = "Changed Alias"
owners = [
Expand Down

0 comments on commit 761341d

Please sign in to comment.