diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000..38b7041 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,42 @@ +name: Bug Report +description: Found a bug that needs fixing? +body: + - type: checkboxes + attributes: + label: General Troubleshooting + description: You confirm to have made the following checks first. + options: + - label: I have checked for similar issues on the Issue-tracker. + required: true + - label: I have updated to the latest version + required: true + - label: I have checked the branches or the maintainers' PRs for upcoming bug fixes. + required: true + - type: textarea + attributes: + label: "Description" + description: "General information about the bug" + placeholder: "..." + validations: + required: true + - type: textarea + attributes: + label: "Steps to reproduce" + description: "What happened when the bug occurred?" + placeholder: "1. ..." + validations: + required: true + - type: textarea + attributes: + label: "Expected behaviour" + description: "What should happen?" + placeholder: "It should..." + validations: + required: true + - type: textarea + attributes: + label: "Actual behaviour" + description: "What did happen instead?" + placeholder: "It actually ..." + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml new file mode 100644 index 0000000..df8f9b1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature.yml @@ -0,0 +1,36 @@ +name: Feature request +description: Want some functionality added? +body: + - type: checkboxes + attributes: + label: General Information + description: You confirm to have made the following checks first. + options: + - label: I have checked for similar issues on the Issue-tracker. + required: true + - label: I have updated to the latest version + required: true + - label: I have checked the branches or the maintainers' PRs for upcoming features fixes. + required: true + - type: textarea + attributes: + label: "Description" + description: "General description of the feature" + placeholder: "..." + validations: + required: true + - type: textarea + attributes: + label: "Feature worth and general use" + description: "Why should this exist?" + placeholder: "..." + validations: + required: true + - type: textarea + attributes: + label: "Suggestions for implementation" + description: "Any ideas about what the feature should behave/look like? Commands?" + placeholder: "It should..." + validations: + required: false + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30da38f..cb4a8f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,5 +34,5 @@ jobs: env: REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/ VERSION: ${{ env.version }} - ABSTRACTO_VERSION: 1.3.12 + ABSTRACTO_VERSION: 1.4.1 ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/ \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/.env b/deployment/docker-compose/src/main/resources/.env index ddfc304..e5338fc 100644 --- a/deployment/docker-compose/src/main/resources/.env +++ b/deployment/docker-compose/src/main/resources/.env @@ -29,4 +29,4 @@ PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev PGADMIN_DEFAULT_PASSWORD=admin TOKEN= YOUTUBE_API_KEY= -ONEPLUS_BOT_VERSION=1.5.10 \ No newline at end of file +ONEPLUS_BOT_VERSION=1.6.0 \ No newline at end of file diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index 5e6a146..d61bb64 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -372,16 +372,6 @@ starboard.zip - - dev.sheldan.abstracto-templates.translations - utility - ${abstracto.templates.version} - zip - true - ${file.basedir}/deployment/translation-artifacts/ - utility.zip - - dev.sheldan.abstracto-templates.translations webservices @@ -600,17 +590,6 @@ dynamic-activity.zip - - dev.sheldan.abstracto.modules - utility-impl - ${abstracto.version} - liquibase - zip - true - ${file.basedir}/deployment/liquibase-artifacts/ - utility.zip - - dev.sheldan.abstracto.modules modmail-impl diff --git a/deployment/infrastructure/terraform/.gitignore b/deployment/infrastructure/terraform/.gitignore new file mode 100644 index 0000000..7a3e2fd --- /dev/null +++ b/deployment/infrastructure/terraform/.gitignore @@ -0,0 +1,29 @@ +# Local .terraform directories +**/.terraform/* + +# .tfstate files +*.tfstate +*.tfstate.* + +# Crash log files +crash.log + +# Ignore any .tfvars files that are generated automatically for each Terraform run. Most +# .tfvars files are managed as part of configuration and so should be included in +# version control. +# +# example.tfvars + +# Ignore override files as they are usually used to override resources locally and so +# are not checked in +override.tf +override.tf.json +*_override.tf +*_override.tf.json + +# Include override files you do wish to add to version control using negated pattern +# +# !example_override.tf + +# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan +# example: *tfplan* diff --git a/deployment/infrastructure/terraform/.terraform.lock.hcl b/deployment/infrastructure/terraform/.terraform.lock.hcl new file mode 100644 index 0000000..78c4ae2 --- /dev/null +++ b/deployment/infrastructure/terraform/.terraform.lock.hcl @@ -0,0 +1,23 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hetznercloud/hcloud" { + version = "1.34.3" + hashes = [ + "h1:ZAFEiotL15xHI957CrTJEm3z83/lFMQdNWiMqN7Dyu4=", + "zh:08e4aea3c4e895d941c24d76f373977e5fae112c531b56cb2fcdaa8b5086ebec", + "zh:09f1255aad8f790c86a14522c7fff2fcb6529bb18f1e49a7423ca79db07f5a47", + "zh:0b2bcab12aa913adaf89228a250eb41e827c64723a741f2b74b318833f77c9df", + "zh:0c6947f73dc5779b2425e231b22643741b1877705fb4135df06f7a201f10d094", + "zh:26513bdefecae83411997a5c4e11dffd886b4594cb8663f4b0c36a064b1a650e", + "zh:42790576142fb7d0ce851923f58a642e7e4c9e6df9a02b531703131d836daade", + "zh:5095ea6c8b31dfebd52a03f9ba4e2a8a7ecb0c0442f68c98cab76b677c343e81", + "zh:6b80223b2831f9f2adf72c7ed37692cef67c8f43de62c405c7162bf524896bc3", + "zh:6b90164e839ad0977b3feb4dbec153ab76a4f7ee8451ee2d202992ff5a4157b1", + "zh:72d88705afb9d0a9d90a5ad342c605cb119b678e76f45c5e4c516da5d591f907", + "zh:881889a9e974a15c616cd7648f1c415a4fb3e9a08c166bcb17e488bfcbb67985", + "zh:967286f7ef73bb15c2412b9ae8853d1176a039374c5ea39cbfd75e7ebe13bcfd", + "zh:967a6cc506a019c1720f0207068097a06eb006e940ecc63060373b4b4b6181cc", + "zh:a68e5e2e2f03656e427045e32ca999422e00be299fc6ecedbd41bef48871b7c5", + ] +} diff --git a/deployment/infrastructure/terraform/cloud.tf b/deployment/infrastructure/terraform/cloud.tf new file mode 100644 index 0000000..d196c7b --- /dev/null +++ b/deployment/infrastructure/terraform/cloud.tf @@ -0,0 +1,10 @@ +terraform { + cloud { + hostname = "app.terraform.io" + organization = "OnePlusBot" + + workspaces { + name = "main" + } + } +} \ No newline at end of file diff --git a/deployment/infrastructure/terraform/main.tf b/deployment/infrastructure/terraform/main.tf new file mode 100644 index 0000000..eb92d1f --- /dev/null +++ b/deployment/infrastructure/terraform/main.tf @@ -0,0 +1,7 @@ +module "hetzner" { + source = "git@github.com:Sheldan/discord-bot-terraform-module.git//hetzner-bot?ref=v1.0.1" + ssh_key_key = "Sheldan" + project_name = "OnePlusBot" + user_name = "sheldan" + hcloud_token = var.hcloud_token +} \ No newline at end of file diff --git a/deployment/infrastructure/terraform/output.tf b/deployment/infrastructure/terraform/output.tf new file mode 100644 index 0000000..d00e897 --- /dev/null +++ b/deployment/infrastructure/terraform/output.tf @@ -0,0 +1,4 @@ +output "instance_ipv4" { + description = "IPv4 address of the instance" + value = module.hetzner.instance_ipv4 +} \ No newline at end of file diff --git a/deployment/infrastructure/terraform/variables.tf b/deployment/infrastructure/terraform/variables.tf new file mode 100644 index 0000000..27460c4 --- /dev/null +++ b/deployment/infrastructure/terraform/variables.tf @@ -0,0 +1,3 @@ +variable "hcloud_token" { + type = string +} \ No newline at end of file