From 2e18cc5156db4471dd63a547b13c3ccf3ecd0388 Mon Sep 17 00:00:00 2001 From: Matthew McKinnon Date: Sat, 17 May 2025 13:11:25 +1000 Subject: [PATCH] chore: fix pg connection --- .gitignore | 2 +- .terraform.lock.hcl | 59 +++++++++++++++++++++++---------------------- prepareEnv.sh | 3 +++ provider.tf | 2 +- 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 10fe8ad..856d527 100755 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ terraform.auto.tfvars tokens.txt terraform.tfstate* .bitwarden/ - +.terraform.lock.hcl \ No newline at end of file diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 400bbb4..bda9beb 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,41 +2,42 @@ # Manual edits may be lost in future updates. provider "registry.opentofu.org/hashicorp/null" { - version = "3.2.3" + version = "3.2.4" hashes = [ - "h1:LF8arSzHfhbyQSFtTMTYEqCM34klzrbAQBJMHYCs9d8=", - "zh:1d57d25084effd3fdfd902eca00020b34b1fb020253b84d7dd471301606015ac", - "zh:65b7f9799b88464d9c2ec529713b7f52ea744275b61a8dc86cdedab1b2dcb933", - "zh:80d3e9c95b7b4ae7c54005cd127cae82e5c53d2b7023ef24c147337bac9dadd9", - "zh:841b60c07683e4bf456799ccd718896fdafdcc2c49252ae09967f2e74d8c8a03", - "zh:8fa1c592a9c78222e35713c6edb3f1f818a4c6f3524a30a209f0a7e919827b68", - "zh:bb795cc1429e09466840c09d39a28edf1db5070b1ec76822fc1173906a264572", - "zh:da1784818a89bea29dfe660632f0060a7a843e4e564d74435fbeca002b0f7d2a", - "zh:f409bf21b1cdaa6dac47cd79806f3d93f67e9507fe4dbf33b0165335f53bc2e1", - "zh:fbea7a1ff84b430ba9594698e93196d81d03e4036de3d1cafccb2a96d5b38581", - "zh:fbf0c84663a7e85881388d7d71ac862184f05fbf2d17ecf76bc5d3d7503ea260", + "h1:jsKjBiLb+v3OIC3xuDiY4sR0r1OHUMSWPYKult9MhT0=", + "zh:1769783386610bed8bb1e861a119fe25058be41895e3996d9216dd6bb8a7aee3", + "zh:32c62a9387ad0b861b5262b41c5e9ed6e940eda729c2a0e58100e6629af27ddb", + "zh:339bf8c2f9733fce068eb6d5612701144c752425cebeafab36563a16be460fb2", + "zh:36731f23343aee12a7e078067a98644c0126714c4fe9ac930eecb0f2361788c4", + "zh:3d106c7e32a929e2843f732625a582e562ff09120021e510a51a6f5d01175b8d", + "zh:74bcb3567708171ad83b234b92c9d63ab441ef882b770b0210c2b14fdbe3b1b6", + "zh:90b55bdbffa35df9204282251059e62c178b0ac7035958b93a647839643c0072", + "zh:ae24c0e5adc692b8f94cb23a000f91a316070fdc19418578dcf2134ff57cf447", + "zh:b5c10d4ad860c4c21273203d1de6d2f0286845edf1c64319fa2362df526b5f58", + "zh:e05bbd88e82e1d6234988c85db62fd66f11502645838fff594a2ec25352ecd80", ] } provider "registry.opentofu.org/maxlaverse/bitwarden" { - version = "0.1.1" - constraints = "~> 0.1.0" + version = "0.13.6" + constraints = ">= 0.13.6" hashes = [ - "h1:ZtHaTCuLMChMG8AJ7M8/ZOMqCTdCMfLhxOWTlZb5LMo=", - "zh:190c3c9aab29815a0d6d5b7d0f0bcf299c08a36af0142a23e381894cf12ca342", - "zh:2a90054074e4c651e19b423b1c5a4fff75973f52a290890b06ebfb6aa73ea3a4", - "zh:38396bdc54fed6680a0303c7919a4fc417d5c4438ddb0e2e1a065091990bb350", - "zh:63e899f3a4bb735f50ad90bc839e5d0f68f8b1b96974d91832147d2d16997a88", - "zh:96da402041eeec5dec9d738777dcaa2c81742086ee2911bb2df9fd685709629b", - "zh:99c18a7e8a6ddc84947c19f051a896a20c20b84914895ba538d25b80fbc9cda6", - "zh:a95a5a3e62bf751a531df58ec555eb98ce13c00e40d343c293f621b4a5c80b6e", - "zh:b93b7e5ea921e425fbc901e7696702df80eb2b8243693abd18a4e6d3df0af6b0", - "zh:bb1228c8205d9b589674f853cc6c788de2a95e29f33f0c929727c1986a02e3b6", - "zh:beaf5ffa167de3c9ab01bf937b671ff90a65fd7de38612195da5f8d9e532c534", - "zh:d2849ed82549744fd8c36a3ae694b935ab3afe8fc7a78c60339581fed5d63112", - "zh:f90c25c736fa0f17f33c96d5ec0b7d45159397acfcdc0bce68e574d673f0f764", - "zh:fa91da4161f5b4580df79f10f891f5b88827941110fae1906a1a672b31a94dd0", - "zh:fae5d219184274ebbce7f6766398c44ec593c1ffb5d2e872a81478b5eb57f01d", + "h1:WTSDFVmPxY92/9kJbgTyKmwENDxf4nc2SNe8PcvRd/U=", + "zh:0548cf354bd65bb146e63db28fe3c6ab9339118f0255271886d8088325c7a044", + "zh:1eb2f8b07da17acb0cf9fde60b15facfe599faaf912b0a540ad18629e6fd76eb", + "zh:2f58bcce32cb8082f0627f7ca12925d73e0c9a2fe9501a6060dfa90472a5ddc3", + "zh:2fea04c23e1333a7682538033dc87be2df7ed55226c3972e62600e434ea1e3de", + "zh:34cf36acad9a731bdce793995ffd539b3578a4e15cf04e59faf8de884e585ec0", + "zh:3516e5d815938b87749bdb427971955b875e1e0dd051f180988a8731cc0ca2ec", + "zh:578b199ac64e8ecef439a15c4d0b5be42fee3872706ca1789842e3471cb59b0c", + "zh:6ac028d60fb9fd9dc8115888786224f38f59807d0971ed6e8ac3882eb5dbf680", + "zh:743f1fd4933d9bfae0256921326649d5139a7023040d86c36cc48a1a4a8f04fc", + "zh:893bafe00218cd5352c176c54cef573d709705f8d569ae49fd0e7eaf0c8f7d44", + "zh:a45c56bb6cde3070ca1e3d2f500811f585f9c2cd1cc337c2c1e50e6283cdc86f", + "zh:c39941a88c19ff15a55fcf88cdb98fbc917355db7e7100f6c9beff8016d15a1d", + "zh:dc5e6fbb1a06134233ebc42bfbb1a7979aac5625c186f8ead5d28295cfbd0cb1", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffec18112906046d45ffd1bb0fbd8387e99e4b8834c215ad0d5790bc71df450f", ] } diff --git a/prepareEnv.sh b/prepareEnv.sh index c1de4e1..8267b7c 100755 --- a/prepareEnv.sh +++ b/prepareEnv.sh @@ -1,5 +1,6 @@ #!/bin/bash +bw config server https://vault.comprofix.com bw login export BW_SESSION=$(bw unlock --raw) bw sync @@ -18,6 +19,8 @@ tfusername=$(bw get --session $BW_SESSION username tofu_postgres) tfpassword=$(bw get --session $BW_SESSION password tofu_postgres) tfurl=$(bw get --session $BW_SESSION uri tofu_postgres) +export PG_CONN_STR=postgres://$tfusername:$tfpassword@tfurl + echo 'proxmox_api_url = "'$proxmox_api_url'"' > terraform.auto.tfvars echo 'proxmox_api_token_id = "'$proxmox_api_token_id'"' >> terraform.auto.tfvars echo 'proxmox_api_token_secret = "'$proxmox_api_token_secret'"' >> terraform.auto.tfvars diff --git a/provider.tf b/provider.tf index 8a76e92..bd4effb 100644 --- a/provider.tf +++ b/provider.tf @@ -7,7 +7,7 @@ terraform { bitwarden = { source = "maxlaverse/bitwarden" - version = "~> 0.1.0" + version = ">= 0.13.6" } }