Skip to content

Commit

Permalink
Updated upstream modules
Browse files Browse the repository at this point in the history 
Conflict with the app_monitoring resource in .NET. Renamed `AppMonitoringOverrides`
  • Loading branch information
@pierskarsenbarg
pierskarsenbarg committed Sep 24, 2024
1 parent 144e7f1 commit 857d8f5
Show file tree
Hide file tree
Showing 39 changed files with 2,637 additions and 870 deletions.
138 changes: 138 additions & 0 deletions provider/cmd/pulumi-resource-dynatrace/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@
"iamClientSecret": {
"type": "string",
"secret": true
},
"iamEndpointUrl": {
"type": "string",
"secret": true
},
"iamTokenUrl": {
"type": "string",
"secret": true
}
}
},
Expand Down Expand Up @@ -607,6 +615,37 @@
"pattern"
]
},
"dynatrace:index/AppMonitoringAppMonitoring:AppMonitoringAppMonitoring": {
"properties": {
"appMonitorings": {
"type": "array",
"items": {
"$ref": "#/types/dynatrace:index/AppMonitoringAppMonitoringAppMonitoring:AppMonitoringAppMonitoringAppMonitoring"
}
}
},
"type": "object",
"required": [
"appMonitorings"
]
},
"dynatrace:index/AppMonitoringAppMonitoringAppMonitoring:AppMonitoringAppMonitoringAppMonitoring": {
"properties": {
"appId": {
"type": "string",
"description": "App ID\n"
},
"customLogLevel": {
"type": "string",
"description": "Possible Values: `Debug`, `Error`, `Info`, `Off`, `UseDefault`, `Warn`\n"
}
},
"type": "object",
"required": [
"appId",
"customLogLevel"
]
},
"dynatrace:index/ApplicationAnomaliesFailureRate:ApplicationAnomaliesFailureRate": {
"properties": {
"auto": {
Expand Down Expand Up @@ -37752,6 +37791,14 @@
"iamClientSecret": {
"type": "string",
"secret": true
},
"iamEndpointUrl": {
"type": "string",
"secret": true
},
"iamTokenUrl": {
"type": "string",
"secret": true
}
},
"inputProperties": {
Expand Down Expand Up @@ -37833,6 +37880,14 @@
"iamClientSecret": {
"type": "string",
"secret": true
},
"iamEndpointUrl": {
"type": "string",
"secret": true
},
"iamTokenUrl": {
"type": "string",
"secret": true
}
}
},
Expand Down Expand Up @@ -38658,6 +38713,15 @@
},
"dynatrace:index/appMonitoring:AppMonitoring": {
"properties": {
"appMonitoring": {
"$ref": "#/types/dynatrace:index/AppMonitoringAppMonitoring:AppMonitoringAppMonitoring",
"description": "You can override the default monitoring setting for each app separately\n",
"language": {
"csharp": {
"name": "AppMonitoringOverrides"
}
}
},
"defaultLogLevel": {
"type": "string",
"description": "Possible Values: `All`, `Off`\n"
Expand All @@ -38667,6 +38731,15 @@
"defaultLogLevel"
],
"inputProperties": {
"appMonitoring": {
"$ref": "#/types/dynatrace:index/AppMonitoringAppMonitoring:AppMonitoringAppMonitoring",
"description": "You can override the default monitoring setting for each app separately\n",
"language": {
"csharp": {
"name": "AppMonitoringOverrides"
}
}
},
"defaultLogLevel": {
"type": "string",
"description": "Possible Values: `All`, `Off`\n"
Expand All @@ -38678,6 +38751,15 @@
"stateInputs": {
"description": "Input properties used for looking up and filtering AppMonitoring resources.\n",
"properties": {
"appMonitoring": {
"$ref": "#/types/dynatrace:index/AppMonitoringAppMonitoring:AppMonitoringAppMonitoring",
"description": "You can override the default monitoring setting for each app separately\n",
"language": {
"csharp": {
"name": "AppMonitoringOverrides"
}
}
},
"defaultLogLevel": {
"type": "string",
"description": "Possible Values: `All`, `Off`\n"
Expand Down Expand Up @@ -46251,6 +46333,62 @@
"type": "object"
}
},
"dynatrace:index/devobsGitOnprem:DevobsGitOnprem": {
"properties": {
"gitProvider": {
"type": "string",
"description": "Possible Values: `AzureOnPrem`, `BitbucketOnPrem`, `GithubOnPrem`, `GitlabOnPrem`\n"
},
"includeCredentials": {
"type": "boolean",
"description": "If turned on, requests to your Gitlab server will have the `credentials` option set to `include`. Otherwise, it will be\nset to `omit`.\n"
},
"url": {
"type": "string",
"description": "An HTTP/HTTPS URL of your server\n"
}
},
"required": [
"gitProvider",
"url"
],
"inputProperties": {
"gitProvider": {
"type": "string",
"description": "Possible Values: `AzureOnPrem`, `BitbucketOnPrem`, `GithubOnPrem`, `GitlabOnPrem`\n"
},
"includeCredentials": {
"type": "boolean",
"description": "If turned on, requests to your Gitlab server will have the `credentials` option set to `include`. Otherwise, it will be\nset to `omit`.\n"
},
"url": {
"type": "string",
"description": "An HTTP/HTTPS URL of your server\n"
}
},
"requiredInputs": [
"gitProvider",
"url"
],
"stateInputs": {
"description": "Input properties used for looking up and filtering DevobsGitOnprem resources.\n",
"properties": {
"gitProvider": {
"type": "string",
"description": "Possible Values: `AzureOnPrem`, `BitbucketOnPrem`, `GithubOnPrem`, `GitlabOnPrem`\n"
},
"includeCredentials": {
"type": "boolean",
"description": "If turned on, requests to your Gitlab server will have the `credentials` option set to `include`. Otherwise, it will be\nset to `omit`.\n"
},
"url": {
"type": "string",
"description": "An HTTP/HTTPS URL of your server\n"
}
},
"type": "object"
}
},
"dynatrace:index/directShares:DirectShares": {
"description": "\u003e This resource is currently not covered by the export utility.\n\n## Dynatrace Documentation\n\n- Dynatrace Documents - https://########.apps.dynatrace.com/platform/swagger-ui/index.html?urls.primaryName=Document%20Service\n\n## Prerequisites\n\nUsing this resource requires an OAuth client to be configured within your account settings.\nThe scopes of the OAuth Client need to include `Read direct-shares (document:direct-shares:read)`, `Write direct-shares (document:direct-shares:write)`, `Delete direct-shares (document:direct-shares:delete)`.\n\nFinally the provider configuration requires the credentials for that OAuth Client.\nThe configuration section of your provider needs to look like this.\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\n```\n```python\nimport pulumi\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n }\n}\n```\n```yaml\n{}\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n\u003e In order to handle credentials in a secure manner we recommend to use the environment variables `DYNATRACE_AUTOMATION_CLIENT_ID` and `DYNATRACE_AUTOMATION_CLIENT_SECRET` as an alternative.\n\n## Resource Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as dynatrace from \"@pulumiverse/dynatrace\";\n\nconst _this = new dynatrace.DirectShares(\"this\", {\n access: \"read-write\",\n documentId: \"441564f0-23c9-40ef-b344-18c02c23d712\",\n recipients: {\n recipients: [\n {\n id: \"441664f0-23c9-40ef-b344-18c02c23d787\",\n type: \"user\",\n },\n {\n id: \"441664f0-23c9-40ef-b344-18c02c23d788\",\n type: \"group\",\n },\n ],\n },\n});\n```\n```python\nimport pulumi\nimport pulumiverse_dynatrace as dynatrace\n\nthis = dynatrace.DirectShares(\"this\",\n access=\"read-write\",\n document_id=\"441564f0-23c9-40ef-b344-18c02c23d712\",\n recipients={\n \"recipients\": [\n {\n \"id\": \"441664f0-23c9-40ef-b344-18c02c23d787\",\n \"type\": \"user\",\n },\n {\n \"id\": \"441664f0-23c9-40ef-b344-18c02c23d788\",\n \"type\": \"group\",\n },\n ],\n })\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Dynatrace = Pulumiverse.Dynatrace;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var @this = new Dynatrace.DirectShares(\"this\", new()\n {\n Access = \"read-write\",\n DocumentId = \"441564f0-23c9-40ef-b344-18c02c23d712\",\n Recipients = new Dynatrace.Inputs.DirectSharesRecipientsArgs\n {\n Recipients = new[]\n {\n new Dynatrace.Inputs.DirectSharesRecipientsRecipientArgs\n {\n Id = \"441664f0-23c9-40ef-b344-18c02c23d787\",\n Type = \"user\",\n },\n new Dynatrace.Inputs.DirectSharesRecipientsRecipientArgs\n {\n Id = \"441664f0-23c9-40ef-b344-18c02c23d788\",\n Type = \"group\",\n },\n },\n },\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n\t\"github.com/pulumiverse/pulumi-dynatrace/sdk/go/dynatrace\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t_, err := dynatrace.NewDirectShares(ctx, \"this\", \u0026dynatrace.DirectSharesArgs{\n\t\t\tAccess: pulumi.String(\"read-write\"),\n\t\t\tDocumentId: pulumi.String(\"441564f0-23c9-40ef-b344-18c02c23d712\"),\n\t\t\tRecipients: \u0026dynatrace.DirectSharesRecipientsArgs{\n\t\t\t\tRecipients: dynatrace.DirectSharesRecipientsRecipientArray{\n\t\t\t\t\t\u0026dynatrace.DirectSharesRecipientsRecipientArgs{\n\t\t\t\t\t\tId: pulumi.String(\"441664f0-23c9-40ef-b344-18c02c23d787\"),\n\t\t\t\t\t\tType: pulumi.String(\"user\"),\n\t\t\t\t\t},\n\t\t\t\t\t\u0026dynatrace.DirectSharesRecipientsRecipientArgs{\n\t\t\t\t\t\tId: pulumi.String(\"441664f0-23c9-40ef-b344-18c02c23d788\"),\n\t\t\t\t\t\tType: pulumi.String(\"group\"),\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.dynatrace.DirectShares;\nimport com.pulumi.dynatrace.DirectSharesArgs;\nimport com.pulumi.dynatrace.inputs.DirectSharesRecipientsArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var this_ = new DirectShares(\"this\", DirectSharesArgs.builder()\n .access(\"read-write\")\n .documentId(\"441564f0-23c9-40ef-b344-18c02c23d712\")\n .recipients(DirectSharesRecipientsArgs.builder()\n .recipients( \n DirectSharesRecipientsRecipientArgs.builder()\n .id(\"441664f0-23c9-40ef-b344-18c02c23d787\")\n .type(\"user\")\n .build(),\n DirectSharesRecipientsRecipientArgs.builder()\n .id(\"441664f0-23c9-40ef-b344-18c02c23d788\")\n .type(\"group\")\n .build())\n .build())\n .build());\n\n }\n}\n```\n```yaml\nresources:\n this:\n type: dynatrace:DirectShares\n properties:\n access: read-write\n documentId: 441564f0-23c9-40ef-b344-18c02c23d712\n recipients:\n recipients:\n - id: 441664f0-23c9-40ef-b344-18c02c23d787\n type: user\n - id: 441664f0-23c9-40ef-b344-18c02c23d788\n type: group\n```\n\u003c!--End PulumiCodeChooser --\u003e\n",
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22
replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20240520223432-0c0bf0d65f10

require (
github.com/dynatrace-oss/terraform-provider-dynatrace v1.66.0
github.com/dynatrace-oss/terraform-provider-dynatrace v1.67.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.0
github.com/pulumi/pulumi/sdk/v3 v3.130.0
)
Expand Down
4 changes: 2 additions & 2 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1350,8 +1350,8 @@ github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cn
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/dynatrace-oss/terraform-provider-dynatrace v1.66.0 h1:AWAmwYujhrONCUvOZNBcfo63SLJFb5QuNYmkusGG9fU=
github.com/dynatrace-oss/terraform-provider-dynatrace v1.66.0/go.mod h1:Qpl5yM+9OEikThPmduXOQCLgS0QDrlint1whnPkk9go=
github.com/dynatrace-oss/terraform-provider-dynatrace v1.67.0 h1:1JwAbOmB1snmCl9h90IVUxQSy/BwkpzrwYNP3uqcwK0=
github.com/dynatrace-oss/terraform-provider-dynatrace v1.67.0/go.mod h1:Qpl5yM+9OEikThPmduXOQCLgS0QDrlint1whnPkk9go=
github.com/dynatrace/dynatrace-configuration-as-code-core v0.5.1 h1:xaKtl+Ane5APeAmpyrW6xcGkr8rbXc5YNYyvu2V9cyI=
github.com/dynatrace/dynatrace-configuration-as-code-core v0.5.1/go.mod h1:T1D01r9c2WR9J7T1vTRWn+TakH7rjBJ6/1h+x0OmL6w=
github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
Expand Down
20 changes: 14 additions & 6 deletions provider/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,19 @@ func Provider() tfbridge.ProviderInfo {
},
PreConfigureCallback: preConfigureCallback,
Resources: map[string]*tfbridge.ResourceInfo{
"dynatrace_alerting": {Tok: dynatraceResource(mainMod, "Alerting")},
"dynatrace_activegate_token": {Tok: dynatraceResource(mainMod, "ActivegateToken")},
"dynatrace_activegate_updates": {Tok: dynatraceResource(mainMod, "ActivegateUpdates")},
"dynatrace_alerting_profile": {Tok: dynatraceResource(mainMod, "AlertingProfile")},
"dynatrace_aix_extension": {Tok: dynatraceResource(mainMod, "AixExtension")},
"dynatrace_alerting": {Tok: dynatraceResource(mainMod, "Alerting")},
"dynatrace_activegate_token": {Tok: dynatraceResource(mainMod, "ActivegateToken")},
"dynatrace_activegate_updates": {Tok: dynatraceResource(mainMod, "ActivegateUpdates")},
"dynatrace_alerting_profile": {Tok: dynatraceResource(mainMod, "AlertingProfile")},
"dynatrace_aix_extension": {Tok: dynatraceResource(mainMod, "AixExtension")},
"dynatrace_app_monitoring": {
Tok: dynatraceResource(mainMod, "AppMonitoring"),
Fields: map[string]*tfbridge.SchemaInfo{
"app_monitoring": {
CSharpName: "AppMonitoringOverrides",
},
},
},
"dynatrace_application_anomalies": {Tok: dynatraceResource(mainMod, "ApplicationAnomalies")},
"dynatrace_application_data_privacy": {Tok: dynatraceResource(mainMod, "ApplicationDataPrivacy")},
"dynatrace_application_detection_rule": {Tok: dynatraceResource(mainMod, "ApplicationDetectionRule")},
Expand Down Expand Up @@ -163,7 +171,7 @@ func Provider() tfbridge.ProviderInfo {
Tok: dynatraceResource(mainMod, "ConnectivityAlerts"),
Fields: map[string]*tfbridge.SchemaInfo{"connectivity_alerts": {CSharpName: "EnableConnectivityAlerts"}},
},
"dynatrace_container_builtin_rule": {Tok: dynatraceResource(mainMod, "ContainerBuiltinRule")},
"dynatrace_container_builtin_rule": {Tok: dynatraceResource(mainMod, "ContainerBuiltinRule")},
"dynatrace_container_registry": {
Tok: tfbridge.MakeResource(mainPkg, mainMod, "ContainerRegistry"),
Fields: map[string]*tfbridge.SchemaInfo{
Expand Down
18 changes: 18 additions & 0 deletions sdk/dotnet/AppMonitoring.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ namespace Pulumiverse.Dynatrace
[DynatraceResourceType("dynatrace:index/appMonitoring:AppMonitoring")]
public partial class AppMonitoring : global::Pulumi.CustomResource
{
/// <summary>
/// You can override the default monitoring setting for each app separately
/// </summary>
[Output("appMonitoring")]
public Output<Outputs.AppMonitoringAppMonitoring?> AppMonitoringOverrides { get; private set; } = null!;

/// <summary>
/// Possible Values: `All`, `Off`
/// </summary>
Expand Down Expand Up @@ -66,6 +72,12 @@ public static AppMonitoring Get(string name, Input<string> id, AppMonitoringStat

public sealed class AppMonitoringArgs : global::Pulumi.ResourceArgs
{
/// <summary>
/// You can override the default monitoring setting for each app separately
/// </summary>
[Input("appMonitoring")]
public Input<Inputs.AppMonitoringAppMonitoringArgs>? AppMonitoringOverrides { get; set; }

/// <summary>
/// Possible Values: `All`, `Off`
/// </summary>
Expand All @@ -80,6 +92,12 @@ public AppMonitoringArgs()

public sealed class AppMonitoringState : global::Pulumi.ResourceArgs
{
/// <summary>
/// You can override the default monitoring setting for each app separately
/// </summary>
[Input("appMonitoring")]
public Input<Inputs.AppMonitoringAppMonitoringGetArgs>? AppMonitoringOverrides { get; set; }

/// <summary>
/// Possible Values: `All`, `Off`
/// </summary>
Expand Down
Loading

0 comments on commit 857d8f5

Please sign in to comment.