drop dead s3 code
use region from env as well
This commit is contained in:
@@ -24,23 +24,11 @@ spec:
|
|||||||
env:
|
env:
|
||||||
- name: OIDC_USERS_NAMESPACE
|
- name: OIDC_USERS_NAMESPACE
|
||||||
value: "default"
|
value: "default"
|
||||||
# Google test key
|
|
||||||
- name: RECAPTCHA_PUBLIC_KEY
|
|
||||||
value: 6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
|
|
||||||
- name: RECAPTCHA_PRIVATE_KEY
|
|
||||||
value: 6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
|
|
||||||
- name: INVENTORY_ASSETS_BASE_URL
|
|
||||||
value: "https://minio.codemowers.eu:9000"
|
|
||||||
- name: MONGO_URI
|
- name: MONGO_URI
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: mongodb-application-readwrite
|
name: mongodb-application-readwrite
|
||||||
key: connectionString.standard
|
key: connectionString.standard
|
||||||
- name: AWS_ENDPOINT_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: miniobucket-inventory-app-owner-secrets
|
|
||||||
key: MINIO_URI
|
|
||||||
- name: ENVIRONMENT_TYPE
|
- name: ENVIRONMENT_TYPE
|
||||||
value: "DEV"
|
value: "DEV"
|
||||||
- name: MY_POD_NAME
|
- name: MY_POD_NAME
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ ENVIRONMENT_TYPE = getenv_in("ENVIRONMENT_TYPE", "DEV", "PROD")
|
|||||||
|
|
||||||
AWS_S3_ENDPOINT_URL = os.environ["AWS_S3_ENDPOINT_URL"]
|
AWS_S3_ENDPOINT_URL = os.environ["AWS_S3_ENDPOINT_URL"]
|
||||||
BUCKET_NAME = os.environ["BUCKET_NAME"]
|
BUCKET_NAME = os.environ["BUCKET_NAME"]
|
||||||
INVENTORY_ASSETS_BASE_URL = os.environ["INVENTORY_ASSETS_BASE_URL"]
|
|
||||||
MONGO_URI = os.environ["MONGO_URI"]
|
MONGO_URI = os.environ["MONGO_URI"]
|
||||||
MACADDRESS_OUTLINK_BASEURL = os.environ["MACADDRESS_OUTLINK_BASEURL"]
|
MACADDRESS_OUTLINK_BASEURL = os.environ["MACADDRESS_OUTLINK_BASEURL"]
|
||||||
COOKIES_SECRET_KEY = os.environ["COOKIES_SECRET_KEY"] # session storage, random chars
|
COOKIES_SECRET_KEY = os.environ["COOKIES_SECRET_KEY"] # session storage, random chars
|
||||||
|
|||||||
@@ -260,11 +260,12 @@ def is_image_ext(filename):
|
|||||||
return '.' in filename and \
|
return '.' in filename and \
|
||||||
filename.rsplit('.', 1)[1].lower() in ["jpg", "jpeg"]
|
filename.rsplit('.', 1)[1].lower() in ["jpg", "jpeg"]
|
||||||
|
|
||||||
def get_bucket():
|
# AWS S3 credentials / env is automagically imported https://boto3.amazonaws.com/v1/documentation/api/latest/guide/configuration.html#using-environment-variables
|
||||||
|
# AWS_ACCESS_KEY_ID, AWS_DEFAULT_REGION, etc
|
||||||
|
def get_bucket(): #TODO
|
||||||
return boto3.client('s3',
|
return boto3.client('s3',
|
||||||
endpoint_url=const.AWS_S3_ENDPOINT_URL,
|
endpoint_url=const.AWS_S3_ENDPOINT_URL,
|
||||||
config=boto3.session.Config(signature_version='s3v4'),
|
config=boto3.session.Config(signature_version='s3v4'))
|
||||||
region_name='us-east-1')
|
|
||||||
|
|
||||||
@page_inventory.route("/inventory/<item_id>/upload-photo", methods=["POST"])
|
@page_inventory.route("/inventory/<item_id>/upload-photo", methods=["POST"])
|
||||||
@login_required
|
@login_required
|
||||||
|
|||||||
@@ -176,7 +176,7 @@ def do_before_request():
|
|||||||
|
|
||||||
@app.context_processor
|
@app.context_processor
|
||||||
def inject_context():
|
def inject_context():
|
||||||
return dict(devenv=devenv, inventory_assets_base_url=const.INVENTORY_ASSETS_BASE_URL)
|
return dict(devenv=devenv)
|
||||||
|
|
||||||
def name_check(form, field):
|
def name_check(form, field):
|
||||||
if field.data != field.data.strip():
|
if field.data != field.data.strip():
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: codemowers.cloud/v1beta1
|
|
||||||
kind: MinioBucketClaim
|
|
||||||
metadata:
|
|
||||||
name: inventory-app
|
|
||||||
spec:
|
|
||||||
capacity: 1Gi
|
|
||||||
class: shared
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
kind: ClusterRoleBinding
|
|
||||||
metadata:
|
|
||||||
name: oidc-gateway-madis
|
|
||||||
roleRef:
|
|
||||||
apiGroup: rbac.authorization.k8s.io
|
|
||||||
kind: ClusterRole
|
|
||||||
name: passmower
|
|
||||||
subjects:
|
|
||||||
- kind: ServiceAccount
|
|
||||||
name: oidc-gateway
|
|
||||||
namespace: hard2k1ll-72zn4
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ServiceAccount
|
|
||||||
metadata:
|
|
||||||
name: oidc-gateway
|
|
||||||
Reference in New Issue
Block a user