Skip to content

Commit c59a38b

Browse files
committed
feat: change kraken to metering
1 parent 9fecdce commit c59a38b

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2020

2121
### Changed
2222

23-
- Documentation for kraken now mentions the use-case: metering.
23+
- Documentation for metering now mentions the use-case: metering.
2424
- Fixed meshcloud-sso module output reference
2525
- Fixed syntax error in a resource in meshcloud-sso module
2626
- Add permissions for tags replication

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Check [examples](./examples/) for different use cases. As a quick start we recom
112112
| Name | Source | Version |
113113
|------|--------|---------|
114114
| <a name="module_idp_lookup_service_principal"></a> [idp\_lookup\_service\_principal](#module\_idp\_lookup\_service\_principal) | ./modules/meshcloud-idp-lookup-service-principal/ | n/a |
115-
| <a name="module_kraken_service_principal"></a> [kraken\_service\_principal](#module\_kraken\_service\_principal) | ./modules/meshcloud-kraken-service-principal/ | n/a |
115+
| <a name="module_metering_service_principal"></a> [metering\_service\_principal](#module\_metering\_service\_principal) | ./modules/meshcloud-metering-service-principal/ | n/a |
116116
| <a name="module_replicator_service_principal"></a> [replicator\_service\_principal](#module\_replicator\_service\_principal) | ./modules/meshcloud-replicator-service-principal/ | n/a |
117117
| <a name="module_uami_blueprint_user_principal"></a> [uami\_blueprint\_user\_principal](#module\_uami\_blueprint\_user\_principal) | ./modules/uami-blueprint-user-principal/ | n/a |
118118

@@ -130,7 +130,7 @@ Check [examples](./examples/) for different use cases. As a quick start we recom
130130
| <a name="input_additional_permissions"></a> [additional\_permissions](#input\_additional\_permissions) | Additional Subscription-Level Permissions the Service Principal needs. | `list(string)` | `[]` | no |
131131
| <a name="input_additional_required_resource_accesses"></a> [additional\_required\_resource\_accesses](#input\_additional\_required\_resource\_accesses) | Additional AAD-Level Resource Accesses the replicator Service Principal needs. | `list(object({ resource_app_id = string, resource_accesses = list(object({ id = string, type = string })) }))` | `[]` | no |
132132
| <a name="input_idplookup_enabled"></a> [idplookup\_enabled](#input\_idplookup\_enabled) | Whether to create idplookup Service Principal or not. | `bool` | `true` | no |
133-
| <a name="input_kraken_enabled"></a> [kraken\_enabled](#input\_kraken\_enabled) | Whether to create Metering Service Principal or not. | `bool` | `true` | no |
133+
| <a name="input_metering_enabled"></a> [metering\_enabled](#input\_metering\_enabled) | Whether to create Metering Service Principal or not. | `bool` | `true` | no |
134134
| <a name="input_mgmt_group_name"></a> [mgmt\_group\_name](#input\_mgmt\_group\_name) | The name or UUID of the Management Group. | `string` | n/a | yes |
135135
| <a name="input_replicator_enabled"></a> [replicator\_enabled](#input\_replicator\_enabled) | Whether to create replicator Service Principal or not. | `bool` | `true` | no |
136136
| <a name="input_replicator_rg_enabled"></a> [replicator\_rg\_enabled](#input\_replicator\_rg\_enabled) | Enables the replicator service principal to be used for Azure Resource Group replication. Implicitly enables the `replicator_enabled` flag. | `bool` | `true` | no |
@@ -144,8 +144,8 @@ Check [examples](./examples/) for different use cases. As a quick start we recom
144144
| <a name="output_azure_ad_tenant_id"></a> [azure\_ad\_tenant\_id](#output\_azure\_ad\_tenant\_id) | The Azure AD tenant id. |
145145
| <a name="output_idp_lookup_service_principal"></a> [idp\_lookup\_service\_principal](#output\_idp\_lookup\_service\_principal) | IDP Lookup Service Principal. |
146146
| <a name="output_idp_lookup_service_principal_password"></a> [idp\_lookup\_service\_principal\_password](#output\_idp\_lookup\_service\_principal\_password) | Password for IDP Lookup Service Principal. |
147-
| <a name="output_kraken_service_principal"></a> [kraken\_service\_principal](#output\_kraken\_service\_principal) | Metering Service Principal. |
148-
| <a name="output_kraken_service_principal_password"></a> [kraken\_service\_principal\_password](#output\_kraken\_service\_principal\_password) | Password for Metering Service Principal. |
147+
| <a name="output_metering_service_principal"></a> [metering\_service\_principal](#output\_metering\_service\_principal) | Metering Service Principal. |
148+
| <a name="output_metering_service_principal_password"></a> [metering\_service\_principal\_password](#output\_metering\_service\_principal\_password) | Password for Metering Service Principal. |
149149
| <a name="output_replicator_service_principal"></a> [replicator\_service\_principal](#output\_replicator\_service\_principal) | Replicator Service Principal. |
150150
| <a name="output_replicator_service_principal_password"></a> [replicator\_service\_principal\_password](#output\_replicator\_service\_principal\_password) | Password for Replicator Service Principal. |
151151
| <a name="output_uami_blueprint_user_principal"></a> [uami\_blueprint\_user\_principal](#output\_uami\_blueprint\_user\_principal) | UAMI Blueprint Assignment Service Principal. |

examples/azure-integration-preprovisioned-subscriptions/outputs.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ output "replicator_service_principal_password" {
99
sensitive = true
1010
}
1111

12-
output "kraken_service_principal" {
12+
output "metering_service_principal" {
1313
description = "Metering Service Principal."
14-
value = module.meshplatform.kraken_service_principal
14+
value = module.meshplatform.metering_service_principal
1515
}
1616

17-
output "kraken_service_principal_password" {
17+
output "metering_service_principal_password" {
1818
description = "Password for Metering Service Principal."
19-
value = module.meshplatform.kraken_service_principal_password
19+
value = module.meshplatform.metering_service_principal_password
2020
sensitive = true
2121
}
2222

examples/azure-integration-with-additional-resource-access/outputs.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ output "replicator_service_principal_password" {
1010
sensitive = true
1111
}
1212

13-
output "kraken_service_principal" {
13+
output "metering_service_principal" {
1414
description = "Metering Service Principal."
15-
value = module.meshplatform.kraken_service_principal
15+
value = module.meshplatform.metering_service_principal
1616
}
1717

18-
output "kraken_service_principal_password" {
18+
output "metering_service_principal_password" {
1919
description = "Password for Metering Service Principal."
20-
value = module.meshplatform.kraken_service_principal_password
20+
value = module.meshplatform.metering_service_principal_password
2121
sensitive = true
2222
}
2323

examples/azure-integration-with-uami-blueprint-user-principal/outputs.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ output "replicator_service_principal_password" {
99
sensitive = true
1010
}
1111

12-
output "kraken_service_principal" {
12+
output "metering_service_principal" {
1313
description = "Metering Service Principal."
14-
value = module.meshplatform.kraken_service_principal
14+
value = module.meshplatform.metering_service_principal
1515
}
1616

17-
output "kraken_service_principal_password" {
17+
output "metering_service_principal_password" {
1818
description = "Password for Metering Service Principal."
19-
value = module.meshplatform.kraken_service_principal_password
19+
value = module.meshplatform.metering_service_principal_password
2020
sensitive = true
2121
}
2222

main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ module "replicator_service_principal" {
2727
additional_permissions = var.additional_permissions
2828
}
2929

30-
module "kraken_service_principal" {
31-
count = var.kraken_enabled ? 1 : 0
32-
source = "./modules/meshcloud-kraken-service-principal/"
30+
module "metering_service_principal" {
31+
count = var.metering_enabled ? 1 : 0
32+
source = "./modules/meshcloud-metering-service-principal/"
3333

3434
service_principal_name_suffix = var.service_principal_name_suffix
3535
scope = data.azurerm_management_group.root.id
@@ -59,8 +59,8 @@ moved {
5959
}
6060

6161
moved {
62-
from = module.kraken_spp
63-
to = module.kraken_service_principal
62+
from = module.metering_spp
63+
to = module.metering_service_principal
6464
}
6565

6666
moved {

outputs.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ output "replicator_service_principal_password" {
1515
# value = length(module.replicator_service_principal) > 0 ? module.replicator_service_principal[0].azuread_application.blueprint_service_principal.object_id : null
1616
# }
1717

18-
output "kraken_service_principal" {
18+
output "metering_service_principal" {
1919
description = "Metering Service Principal."
20-
value = length(module.kraken_service_principal) > 0 ? module.kraken_service_principal[0].service_principal : null
20+
value = length(module.metering_service_principal) > 0 ? module.metering_service_principal[0].service_principal : null
2121
}
2222

23-
output "kraken_service_principal_password" {
23+
output "metering_service_principal_password" {
2424
description = "Password for Metering Service Principal."
25-
value = length(module.kraken_service_principal) > 0 ? module.kraken_service_principal[0].service_principal_password : null
25+
value = length(module.metering_service_principal) > 0 ? module.metering_service_principal[0].service_principal_password : null
2626
sensitive = true
2727
}
2828

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ variable "replicator_rg_enabled" {
2525
description = "Whether the created replicator Service Principal should be usable for Azure Resource Group based replication. Implicitly enables replicator_enabled if set to true."
2626
}
2727

28-
variable "kraken_enabled" {
28+
variable "metering_enabled" {
2929
type = bool
3030
default = true
3131
description = "Whether to create Metering Service Principal or not."

0 commit comments

Comments
 (0)