Skip to content

Commit

Permalink
Merge pull request #4083 from nulib/deploy/staging
Browse files Browse the repository at this point in the history 
Deploy v9.4.4 to production
  • Loading branch information
@bmquinn
bmquinn authored Aug 1, 2024
2 parents d722986 + 050bb10 commit bc16c03
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 37 deletions.
2 changes: 1 addition & 1 deletion app/mix.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Code.require_file("lib/env.ex")
defmodule Meadow.MixProject do
use Mix.Project

@app_version "9.4.3"
@app_version "9.4.4"

def project do
[
Expand Down
2 changes: 1 addition & 1 deletion app/mix.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"broadway_sqs": {:hex, :broadway_sqs, "0.7.4", "ab89b298f9253adb8534f92095b56d4879e35fe2f5a0730256f7e824572c637f", [:mix], [{:broadway, "~> 1.0", [hex: :broadway, repo: "hexpm", optional: false]}, {:ex_aws_sqs, "~> 3.2.1 or ~> 3.3", [hex: :ex_aws_sqs, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.3.7 or ~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:saxy, "~> 1.1", [hex: :saxy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7140085c4f7c4b27886b3a8f3d0942976f39f195fdbc2f652c5d7b157f93ae28"},
"bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
"cachex": {:hex, :cachex, "3.6.0", "14a1bfbeee060dd9bec25a5b6f4e4691e3670ebda28c8ba2884b12fe30b36bf8", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"},
"castore": {:hex, :castore, "1.0.8", "dedcf20ea746694647f883590b82d9e96014057aff1d44d03ec90f36a5c0dc6e", [], [], "hexpm", "0b2b66d2ee742cb1d9cb8c8be3b43c3a70ee8651f37b75a8b982e036752983f1"},
"castore": {:hex, :castore, "1.0.8", "dedcf20ea746694647f883590b82d9e96014057aff1d44d03ec90f36a5c0dc6e", [:mix], [], "hexpm", "0b2b66d2ee742cb1d9cb8c8be3b43c3a70ee8651f37b75a8b982e036752983f1"},
"certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
"configparser_ex": {:hex, :configparser_ex, "4.0.0", "17e2b831cfa33a08c56effc610339b2986f0d82a9caa0ed18880a07658292ab6", [:mix], [], "hexpm", "02e6d1a559361a063cba7b75bc3eb2d6ad7e62730c551cc4703541fd11e65e5b"},
"cowboy": {:hex, :cowboy, "2.12.0", "f276d521a1ff88b2b9b4c54d0e753da6c66dd7be6c9fca3d9418b561828a3731", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"},
Expand Down
2 changes: 1 addition & 1 deletion app/priv/search/v2/settings/work.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
},
"embedding": {
"type": "knn_vector",
"dimension": 384,
"dimension": 768,
"method": {
"name": "hnsw",
"space_type": "cosinesimil",
Expand Down
69 changes: 35 additions & 34 deletions infrastructure/deploy/secrets.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ locals {

config_secrets = {
buckets = {
ingest = aws_s3_bucket.meadow_ingest.bucket
preservation = aws_s3_bucket.meadow_preservation.bucket
pyramid = var.pyramid_bucket
upload = aws_s3_bucket.meadow_uploads.bucket
preservation_check = aws_s3_bucket.meadow_preservation_checks.bucket
sitemap = var.digital_collections_bucket
streaming = aws_s3_bucket.meadow_streaming.bucket
ingest = aws_s3_bucket.meadow_ingest.bucket
preservation = aws_s3_bucket.meadow_preservation.bucket
pyramid = var.pyramid_bucket
upload = aws_s3_bucket.meadow_uploads.bucket
preservation_check = aws_s3_bucket.meadow_preservation_checks.bucket
sitemap = var.digital_collections_bucket
streaming = aws_s3_bucket.meadow_streaming.bucket
}

db = {
host = module.rds.db_instance_address
port = module.rds.db_instance_port
user = module.rds.db_instance_username
password = module.rds.db_instance_password
database = module.rds.db_instance_username
db = {
host = module.rds.db_instance_address
port = module.rds.db_instance_port
user = module.rds.db_instance_username
password = module.rds.db_instance_password
database = module.rds.db_instance_username
}

dc = {
Expand All @@ -30,13 +30,13 @@ locals {

dc_api = {
v2 = {
api_token_secret = local.api_token_secret
api_token_ttl = 300
base_url = var.dc_api_v2_base
api_token_secret = local.api_token_secret
api_token_ttl = 300
base_url = var.dc_api_v2_base
}
}

ezid = {
ezid = {
password = var.ezid_password
shoulder = var.ezid_shoulder
target_base_url = var.ezid_target_base_url
Expand All @@ -45,7 +45,7 @@ locals {
}

geonames = {
username = var.geonames_username
username = var.geonames_username
}

iiif = {
Expand All @@ -55,27 +55,28 @@ locals {
}

search = {
cluster_endpoint = var.elasticsearch_url
access_key_id = aws_iam_access_key.meadow_elasticsearch_access_key.id
secret_access_key = aws_iam_access_key.meadow_elasticsearch_access_key.secret
embedding_model_id = var.embedding_model_id
cluster_endpoint = var.elasticsearch_url
access_key_id = aws_iam_access_key.meadow_elasticsearch_access_key.id
secret_access_key = aws_iam_access_key.meadow_elasticsearch_access_key.secret
embedding_model_id = var.embedding_model_id
embedding_dimensions = var.embedding_dimensions
}

ldap = {
host = var.ldap_server
port = var.ldap_port
base = var.ldap_base_dn
user_dn = var.ldap_bind_dn
password = var.ldap_bind_password
host = var.ldap_server
port = var.ldap_port
base = var.ldap_base_dn
user_dn = var.ldap_bind_dn
password = var.ldap_bind_password
}

mediaconvert = {
queue = aws_media_convert_queue.transcode_queue.arn
role_arn = aws_iam_role.transcode_role.arn
queue = aws_media_convert_queue.transcode_queue.arn
role_arn = aws_iam_role.transcode_role.arn
}

nusso = {
api_key = var.agentless_sso_key
api_key = var.agentless_sso_key
}

pipeline = {
Expand All @@ -90,9 +91,9 @@ locals {
scheduler = {
preservation_check = var.preservation_check_schedule
}

streaming = {
base_url = "https://${aws_route53_record.meadow_streaming_cloudfront.fqdn}/"
base_url = "https://${aws_route53_record.meadow_streaming_cloudfront.fqdn}/"
distribution_id = aws_cloudfront_distribution.meadow_streaming.id
}

Expand All @@ -103,11 +104,11 @@ locals {
}

resource "aws_secretsmanager_secret" "config_secrets" {
name = "config/meadow"
name = "config/meadow"
description = "Meadow configuration secrets"
}

resource "aws_secretsmanager_secret_version" "config_secrets" {
secret_id = aws_secretsmanager_secret.config_secrets.id
secret_id = aws_secretsmanager_secret.config_secrets.id
secret_string = jsonencode(local.config_secrets)
}
4 changes: 4 additions & 0 deletions infrastructure/deploy/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ variable "embedding_model_id" {
type = string
}

variable "embedding_dimensions" {
type = number
}

variable "fixity_function" {
type = string
}
Expand Down

0 comments on commit bc16c03

Please sign in to comment.