Skip to content

Commit 31f7326

Browse files
committed
add tags to azure resource creators
1 parent cde450b commit 31f7326

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

test/helper/cloud/azure/vpc.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"context"
1919
"errors"
2020
"fmt"
21+
taghelper "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper"
2122

2223
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2"
2324

@@ -45,7 +46,10 @@ func CreateVPC(ctx context.Context, vpcName, cidr, region string) (string, error
4546
},
4647
},
4748
Tags: map[string]*string{
48-
"Name": pointer.MakePtr(vpcName),
49+
"Name": pointer.MakePtr(vpcName),
50+
taghelper.OwnerEmailTag: pointer.MakePtr(taghelper.AKOEmail),
51+
taghelper.CostCenterTag: pointer.MakePtr(taghelper.AKOCostCenter),
52+
taghelper.EnvironmentTag: pointer.MakePtr(taghelper.AKOEnvTest),
4953
},
5054
},
5155
nil,

test/helper/e2e/actions/cloud/azure.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"context"
1919
"errors"
2020
"fmt"
21+
taghelper "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper"
2122

2223
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
2324
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
@@ -141,6 +142,11 @@ func (a *AzureAction) CreatePrivateEndpoint(vpcName, subnetName, endpointName, s
141142
},
142143
},
143144
},
145+
Tags: map[string]*string{
146+
taghelper.OwnerEmailTag: pointer.MakePtr(taghelper.AKOEmail),
147+
taghelper.CostCenterTag: pointer.MakePtr(taghelper.AKOCostCenter),
148+
taghelper.EnvironmentTag: pointer.MakePtr(taghelper.AKOEnvTest),
149+
},
144150
},
145151
nil,
146152
)
@@ -246,7 +252,10 @@ func (a *AzureAction) createVpcWithSubnets(ctx context.Context, vpcName, cidr, r
246252
Subnets: subnetsSpec,
247253
},
248254
Tags: map[string]*string{
249-
"Name": pointer.MakePtr(vpcName),
255+
"Name": pointer.MakePtr(vpcName),
256+
taghelper.OwnerEmailTag: pointer.MakePtr(taghelper.AKOEmail),
257+
taghelper.CostCenterTag: pointer.MakePtr(taghelper.AKOCostCenter),
258+
taghelper.EnvironmentTag: pointer.MakePtr(taghelper.AKOEnvTest),
250259
},
251260
},
252261
nil,
@@ -421,6 +430,11 @@ func (a *AzureAction) CreateKeyVault(keyName string) (string, error) {
421430
Properties: &armkeyvault.KeyProperties{
422431
Kty: pointer.MakePtr(armkeyvault.JSONWebKeyTypeRSA),
423432
},
433+
Tags: map[string]*string{
434+
taghelper.OwnerEmailTag: pointer.MakePtr(taghelper.AKOEmail),
435+
taghelper.CostCenterTag: pointer.MakePtr(taghelper.AKOCostCenter),
436+
taghelper.EnvironmentTag: pointer.MakePtr(taghelper.AKOEnvTest),
437+
},
424438
}
425439

426440
r, err := a.keyVaultResourceFactory.NewKeysClient().CreateIfNotExist(ctx, a.resourceGroupName, AzureKeyVaultName, keyName, params, nil)

test/helper/e2e/api/azure/azure.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"context"
1919
"errors"
2020
"fmt"
21+
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer"
22+
taghelper "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper"
2123
"path"
2224
"time"
2325

@@ -63,8 +65,11 @@ func SessionAzure(subscriptionID string, tagNameValue string) (sessionAzure, err
6365
SubscriptionID: subscriptionID,
6466
Authorizer: authorizer,
6567
Tags: map[string]*string{
66-
"name": to.StringPtr(tagNameValue),
67-
config.TagForTestKey: to.StringPtr(config.TagForTestValue),
68+
"name": to.StringPtr(tagNameValue),
69+
config.TagForTestKey: to.StringPtr(config.TagForTestValue),
70+
taghelper.OwnerEmailTag: pointer.MakePtr(taghelper.AKOEmail),
71+
taghelper.CostCenterTag: pointer.MakePtr(taghelper.AKOCostCenter),
72+
taghelper.EnvironmentTag: pointer.MakePtr(taghelper.AKOEnvTest),
6873
},
6974
}, nil
7075
}

0 commit comments

Comments
 (0)