Skip to content

Commit 75161d8

Browse files
malhussanmeshkodiak[bot]
malhussan
authored and
meshkodiak[bot]
committed
fix: syntax in meshcloud-sso module
1 parent 401ee6a commit 75161d8

File tree

7 files changed

+13
-179
lines changed

7 files changed

+13
-179
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
### Changed
1616

1717
- Documentation for kraken now mentions the use-case: metering.
18+
- Fixed meshcloud-sso module output reference
19+
- Fixed syntax error in a resource in meshcloud-sso module
1820

1921
### Added
2022

2123
- Added CHANGELOG.md
24+
- Added pre-commit hooks
2225

2326
## [v0.1.0]
2427

‎modules/meshcloud-idp-lookup-service-principal/README.md

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,3 @@
1-
## Requirements
2-
3-
| Name | Version |
4-
|------|---------|
5-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
6-
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 2.18.0 |
7-
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.3.0 |
8-
9-
## Providers
10-
11-
| Name | Version |
12-
|------|---------|
13-
| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.18.0 |
14-
15-
## Modules
16-
17-
No modules.
18-
19-
## Resources
20-
21-
| Name | Type |
22-
|------|------|
23-
| [azuread_app_role_assignment.meshcloud_idp_lookup](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/app_role_assignment) | resource |
24-
| [azuread_application.meshcloud_idp_lookup](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/application) | resource |
25-
| [azuread_service_principal.meshcloud_idp_lookup](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/service_principal) | resource |
26-
| [azuread_service_principal.msgraph](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/service_principal) | resource |
27-
| [azuread_service_principal_password.service_principal_pw](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/service_principal_password) | resource |
28-
| [azuread_application_published_app_ids.well_known](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/data-sources/application_published_app_ids) | data source |
29-
30-
## Inputs
31-
32-
| Name | Description | Type | Default | Required |
33-
|------|-------------|------|---------|:--------:|
34-
| <a name="input_service_principal_name_suffix"></a> [service\_principal\_name\_suffix](#input\_service\_principal\_name\_suffix) | Service principal name suffix. | `string` | n/a | yes |
35-
36-
## Outputs
37-
38-
| Name | Description |
39-
|------|-------------|
40-
| <a name="output_service_principal"></a> [service\_principal](#output\_service\_principal) | Service Principal application id and object id |
41-
| <a name="output_service_principal_password"></a> [service\_principal\_password](#output\_service\_principal\_password) | Password for the Service Principal. |
42-
431
<!-- BEGIN_TF_DOCS -->
442
## Requirements
453

‎modules/meshcloud-kraken-service-principal/README.md

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,3 @@
1-
## Requirements
2-
3-
| Name | Version |
4-
|------|---------|
5-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
6-
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 2.18.0 |
7-
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.3.0 |
8-
9-
## Providers
10-
11-
| Name | Version |
12-
|------|---------|
13-
| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.18.0 |
14-
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.3.0 |
15-
16-
## Modules
17-
18-
No modules.
19-
20-
## Resources
21-
22-
| Name | Type |
23-
|------|------|
24-
| [azuread_application.meshcloud_kraken](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/application) | resource |
25-
| [azuread_service_principal.meshcloud_kraken](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/service_principal) | resource |
26-
| [azuread_service_principal_password.service_principal_pw](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/service_principal_password) | resource |
27-
| [azurerm_role_assignment.meshcloud_kraken](https://registry.terraform.io/providers/hashicorp/azurerm/3.3.0/docs/resources/role_assignment) | resource |
28-
| [azurerm_role_assignment.meshcloud_kraken_cloud_inventory](https://registry.terraform.io/providers/hashicorp/azurerm/3.3.0/docs/resources/role_assignment) | resource |
29-
| [azurerm_role_definition.meshcloud_kraken_cloud_inventory_role](https://registry.terraform.io/providers/hashicorp/azurerm/3.3.0/docs/resources/role_definition) | resource |
30-
31-
## Inputs
32-
33-
| Name | Description | Type | Default | Required |
34-
|------|-------------|------|---------|:--------:|
35-
| <a name="input_scope"></a> [scope](#input\_scope) | The scope to which Service Principal permissions should be assigned to. Usually this is the management group id of form `/providers/Microsoft.Management/managementGroups/<tenantId>` that sits atop the subscriptions. | `string` | n/a | yes |
36-
| <a name="input_service_principal_name_suffix"></a> [service\_principal\_name\_suffix](#input\_service\_principal\_name\_suffix) | Service principal name suffix. | `string` | n/a | yes |
37-
38-
## Outputs
39-
40-
| Name | Description |
41-
|------|-------------|
42-
| <a name="output_service_principal"></a> [service\_principal](#output\_service\_principal) | Service Principal application id and object id |
43-
| <a name="output_service_principal_password"></a> [service\_principal\_password](#output\_service\_principal\_password) | Password for the Service Principal. |
44-
451
<!-- BEGIN_TF_DOCS -->
462
## Requirements
473

‎modules/meshcloud-sso/README.md

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,3 @@
1-
## Requirements
2-
3-
| Name | Version |
4-
|------|---------|
5-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
6-
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 2.18.0 |
7-
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.3.0 |
8-
9-
## Providers
10-
11-
| Name | Version |
12-
|------|---------|
13-
| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.18.0 |
14-
15-
## Modules
16-
17-
No modules.
18-
19-
## Resources
20-
21-
| Name | Type |
22-
|------|------|
23-
| [azuread_application.meshcloud_sso](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/application) | resource |
24-
| [azuread_application_password.meshcloud_sso](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/application_password) | resource |
25-
| [azuread_service_principal.msgraph](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/service_principal) | resource |
26-
| [azuread_application_published_app_ids.well_known](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/data-sources/application_published_app_ids) | data source |
27-
28-
## Inputs
29-
30-
| Name | Description | Type | Default | Required |
31-
|------|-------------|------|---------|:--------:|
32-
| <a name="input_meshstack_redirect_uri"></a> [meshstack\_redirect\_uri](#input\_meshstack\_redirect\_uri) | Redirect URI that will be provided by meshcloud. It is individual per meshStack. | `string` | n/a | yes |
33-
| <a name="input_service_principal_name_suffix"></a> [service\_principal\_name\_suffix](#input\_service\_principal\_name\_suffix) | Service principal name suffix. | `string` | n/a | yes |
34-
35-
## Outputs
36-
37-
| Name | Description |
38-
|------|-------------|
39-
| <a name="output_app_registration"></a> [app\_registration](#output\_app\_registration) | Application registration application id and object id |
40-
| <a name="output_app_registration_client_secret"></a> [app\_registration\_client\_secret](#output\_app\_registration\_client\_secret) | Password for the application registration. |
41-
421
<!-- BEGIN_TF_DOCS -->
432
## Requirements
443

‎modules/meshcloud-sso/module.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ resource "azuread_application" "meshcloud_sso" {
2929
id = azuread_service_principal.msgraph.app_role_ids["User.Read"]
3030
type = "Scope"
3131
}
32-
33-
# As far as we know it is not possible to automate the "Grant admin consent button" for app registrations
34-
# You have to grant admin consent manually
35-
lifecycle {
36-
ignore_changes = [
37-
app_role
38-
]
39-
}
4032
}
4133

4234
web {
4335
redirect_uris = [var.meshstack_redirect_uri]
4436
}
37+
38+
# As far as we know it is not possible to automate the "Grant admin consent button" for app registrations
39+
# You have to grant admin consent manually
40+
lifecycle {
41+
ignore_changes = [
42+
app_role
43+
]
44+
}
4545
}
4646

4747
resource "azuread_application_password" "meshcloud_sso" {

‎modules/meshcloud-sso/outputs.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
output "app_registration" {
22
description = "Application registration application id and object id"
33
value = {
4-
object_id = azuread_service_principal.meshcloud_sso.id
5-
app_id = azuread_service_principal.meshcloud_sso.application_id
4+
object_id = azuread_application.meshcloud_sso.object_id
5+
app_id = azuread_application.meshcloud_sso.application_id
66
}
77
}
88

‎modules/uami-blueprint-user-principal/README.md

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,3 @@
1-
## Requirements
2-
3-
| Name | Version |
4-
|------|---------|
5-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
6-
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 2.18.0 |
7-
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.3.0 |
8-
9-
## Providers
10-
11-
| Name | Version |
12-
|------|---------|
13-
| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.18.0 |
14-
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.3.0 |
15-
16-
## Modules
17-
18-
No modules.
19-
20-
## Resources
21-
22-
| Name | Type |
23-
|------|------|
24-
| [azuread_application.uami_blueprint_principal](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/application) | resource |
25-
| [azuread_service_principal.uami_blueprint_principal](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/service_principal) | resource |
26-
| [azuread_service_principal_password.service_principal_pw](https://registry.terraform.io/providers/hashicorp/azuread/2.18.0/docs/resources/service_principal_password) | resource |
27-
| [azurerm_role_assignment.service_principal_pw](https://registry.terraform.io/providers/hashicorp/azurerm/3.3.0/docs/resources/role_assignment) | resource |
28-
29-
## Inputs
30-
31-
| Name | Description | Type | Default | Required |
32-
|------|-------------|------|---------|:--------:|
33-
| <a name="input_service_principal_name_suffix"></a> [service\_principal\_name\_suffix](#input\_service\_principal\_name\_suffix) | Service principal name suffix. | `string` | n/a | yes |
34-
| <a name="input_subscriptions"></a> [subscriptions](#input\_subscriptions) | The scope to which UAMI blueprint service principal role assignment is applied. | `list(any)` | n/a | yes |
35-
36-
## Outputs
37-
38-
| Name | Description |
39-
|------|-------------|
40-
| <a name="output_service_principal"></a> [service\_principal](#output\_service\_principal) | n/a |
41-
| <a name="output_service_principal_password"></a> [service\_principal\_password](#output\_service\_principal\_password) | n/a |
42-
431
<!-- BEGIN_TF_DOCS -->
442
## Requirements
453

0 commit comments

Comments
 (0)