Skip to content

Commit

Permalink
Update version to v3.9.0 (closes #36)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbeemster committed Feb 2, 2024
1 parent eeeaed3 commit 49cea8f
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ module "enrich_kinesis" {
| <a name="module_instance_type_metrics"></a> [instance\_type\_metrics](#module\_instance\_type\_metrics) | snowplow-devops/ec2-instance-type-metrics/aws | 0.1.2 |
| <a name="module_kcl_autoscaling"></a> [kcl\_autoscaling](#module\_kcl\_autoscaling) | snowplow-devops/dynamodb-autoscaling/aws | 0.2.0 |
| <a name="module_service"></a> [service](#module\_service) | snowplow-devops/service-ec2/aws | 0.2.1 |
| <a name="module_telemetry"></a> [telemetry](#module\_telemetry) | snowplow-devops/telemetry/snowplow | 0.4.0 |
| <a name="module_telemetry"></a> [telemetry](#module\_telemetry) | snowplow-devops/telemetry/snowplow | 0.5.0 |

## Resources

Expand Down Expand Up @@ -253,6 +253,7 @@ module "enrich_kinesis" {
| <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The VPC to deploy Enrich within (must have DNS hostnames enabled) | `string` | n/a | yes |
| <a name="input_accept_limited_use_license"></a> [accept\_limited\_use\_license](#input\_accept\_limited\_use\_license) | Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/) | `bool` | `false` | no |
| <a name="input_amazon_linux_2_ami_id"></a> [amazon\_linux\_2\_ami\_id](#input\_amazon\_linux\_2\_ami\_id) | The AMI ID to use which must be based of of Amazon Linux 2; by default the latest community version is used | `string` | `""` | no |
| <a name="input_app_version"></a> [app\_version](#input\_app\_version) | App version to use. This variable facilitates dev flow, the modules may not work with anything other than the default value. | `string` | `"3.9.0"` | no |
| <a name="input_assets_update_period"></a> [assets\_update\_period](#input\_assets\_update\_period) | Period after which enrich assets should be checked for updates (e.g. MaxMind DB) | `string` | `"7 days"` | no |
| <a name="input_associate_public_ip_address"></a> [associate\_public\_ip\_address](#input\_associate\_public\_ip\_address) | Whether to assign a public ip address to this instance | `bool` | `true` | no |
| <a name="input_byte_limit"></a> [byte\_limit](#input\_byte\_limit) | The amount of bytes to buffer events before pushing them to Kinesis | `number` | `1000000` | no |
Expand Down
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ locals {
module_version = "0.5.3"

app_name = "enrich-kinesis"
app_version = "3.8.0"
app_version = var.app_version

local_tags = {
Name = var.name
Expand All @@ -26,7 +26,7 @@ data "aws_caller_identity" "current" {}

module "telemetry" {
source = "snowplow-devops/telemetry/snowplow"
version = "0.4.0"
version = "0.5.0"

count = var.telemetry_enabled ? 1 : 0

Expand Down Expand Up @@ -375,7 +375,7 @@ locals {
user_data = templatefile("${path.module}/templates/user-data.sh.tmpl", {
accept_limited_use_license = var.accept_limited_use_license

config = local.hocon
config_b64 = base64encode(local.hocon)
version = local.app_version
resolver = "dynamodb:${data.aws_region.current.name}/${aws_dynamodb_table.config.name}/snowplow_resolver"
enrichments = "dynamodb:${data.aws_region.current.name}/${aws_dynamodb_table.config.name}/snowplow_enrichment_"
Expand Down
1 change: 1 addition & 0 deletions templates/config.hocon.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"autoGeneratedId": "${telemetry_auto_gen_id}"
"moduleName": "${telemetry_module_name}"
"moduleVersion": "${telemetry_module_version}"
"instanceId": $${INSTANCE_ID}
}

"featureFlags" : {
Expand Down
10 changes: 5 additions & 5 deletions templates/user-data.sh.tmpl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
readonly CONFIG_DIR=/opt/snowplow/config

sudo mkdir -p $${CONFIG_DIR}
sudo cat << EOF > $${CONFIG_DIR}/enrich.hocon
${config}
sudo base64 --decode << EOF > $${CONFIG_DIR}/enrich.hocon
${config_b64}
EOF

sudo docker run \
Expand All @@ -19,10 +19,10 @@ sudo docker run \
--log-opt max-size=10m \
--log-opt max-file=5 \
%{ endif ~}
-v $${CONFIG_DIR}:/snowplow/config \
-e 'JAVA_OPTS=-Dconfig.override_with_env_vars=true ${java_opts}' \
--mount type=bind,source=$${CONFIG_DIR},target=/snowplow/config \
--env JDK_JAVA_OPTIONS='${java_opts}' \
--env ACCEPT_LIMITED_USE_LICENSE=${accept_limited_use_license} \
-e "CONFIG_FORCE_telemetry_instanceId=$(get_instance_id)" \
--env INSTANCE_ID=$(get_instance_id) \
snowplow/snowplow-enrich-kinesis:${version} \
--config /snowplow/config/enrich.hocon \
--iglu-config ${resolver} \
Expand Down
6 changes: 6 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ variable "name" {
type = string
}

variable "app_version" {
description = "App version to use. This variable facilitates dev flow, the modules may not work with anything other than the default value."
type = string
default = "3.9.0"
}

variable "vpc_id" {
description = "The VPC to deploy Enrich within (must have DNS hostnames enabled)"
type = string
Expand Down

0 comments on commit 49cea8f

Please sign in to comment.