Skip to content

Commit

Permalink
Remove service definition resource from terraform
Browse files Browse the repository at this point in the history
  • Loading branch information
rotciw committed Sep 3, 2024
1 parent 98c8151 commit f3a6670
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
5 changes: 2 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ locals {
DD_SERVERLESS_LOGS_ENABLED = "true"
DD_LOGS_CONFIG_PROCESSING_RULES = "[{ \"type\" : \"exclude_at_match\", \"name\" : \"exclude_start_and_end_logs\", \"pattern\" : \"(START|END) RequestId\" }]"
DD_PROFILING_ENABLED = "true"
DD_TAGS = "team:utviklerplattform"
DD_EXTENSION_VERSION = "next"
DD_SERVICE = var.dd_service_name
DD_SERVICE = var.datadog_service_name == null ? var.name : var.datadog_service_name
DD_ENV = module.account_metadata.account.environment
DD_SERVICE_MAPPING = "lambda_api_gateway:apigw_${var.name},lambda_sns:sns_${var.name},lambda_sqs:sqs_${var.name},lambda_s3:s3_${var.name},lambda_dynamodb:dynamodb_${var.name}"
DD_VERSION = var.artifact.version
Expand All @@ -91,7 +90,7 @@ module "datadog_metadata" {
source = "./modules/datadog_metadata"

team = "utviklerplattform"
service_name = var.dd_service_name
service_name = var.datadog_service_name

datadog_api_key = data.aws_secretsmanager_secret_version.datadog_api_key.secret_string
datadog_app_key = data.aws_secretsmanager_secret_version.datadog_app_key.secret_string
Expand Down
5 changes: 0 additions & 5 deletions modules/datadog_metadata/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,3 @@ locals {
# tags = ["team:${var.team}"]
}
}

// Service Definition with v2.2 Schema Definition
resource "datadog_service_definition_yaml" "service_definition_v2_2" {
service_definition = yamlencode(local.service_definition)
}
4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ variable "name" {
type = string
}

variable "dd_service_name" {
variable "datadog_service_name" {
description = "The name of the service. A group of function names can be part of the same service"

default = ""
default = null
type = string
}

Expand Down

0 comments on commit f3a6670

Please sign in to comment.