Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add .gitattributes file to repository #166

Merged
merged 2 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
# Do not attempt any end-of-line conversion upon checkin or checkout.
* -text
###############################################################################
# Convert these files to LF on checkin or checkout.
###############################################################################
*.[sS][hH] eol=LF
*.[mM][dD] eol=LF
*.[pP][sS]1 eol=LF
*.[tT][fF] eol=LF
*.[hH][cC][lL] eol=LF
*.[yY][mM][lL] eol=LF
*.[yY][aA][mM][lL] eol=LF
*.[jJ][sS][oO][nN] eol=LF
*.tf.example eol=LF
*.json.example eol=LF
*.tfvars.example eol=LF
LICENSE eol=LF
state-backend-template eol=LF
###############################################################################
# Convert these files to CRLF on checkin or checkout.
###############################################################################
###############################################################################
# Define file name extensions for git lfs handling
###############################################################################
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
*.png binary
#*.gif binary
###############################################################################
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ wildcard.key
temp
terraform.log

tfsec
tfsec

.vs
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ repos:
- id: terraform_docs
name: terraform_docs
entry: --entrypoint /src/hooks/terraform_docs.sh quay.io/terraform-docs/terraform-docs:0.16.0
language: docker_image
language: docker_image
3 changes: 0 additions & 3 deletions .tflint.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@ plugin "aws" {
version = "0.27.0"
source = "github.com/terraform-linters/tflint-ruleset-aws"
}



5 changes: 0 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,3 @@ The hooks calls [`terraform fmt`](https://developer.hashicorp.com/terraform/cli/
# GitHub Workflow

In addition, there is a GitHub Workflow defined in `.github/workflows/qualitygate.yml` that runs `terraform fmt` and `terraform validate` when a pull request is created.





1 change: 0 additions & 1 deletion modules/simphera_aws_instance/backup.tf
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,3 @@ resource "aws_iam_role_policy_attachment" "backup_s3_policy" {
policy_arn = "arn:aws:iam::aws:policy/AWSBackupServiceRolePolicyForS3Backup"
role = aws_iam_role.backup_iam_role[0].name
}

2 changes: 0 additions & 2 deletions modules/simphera_aws_instance/k8s.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ resource "kubernetes_namespace" "k8s_namespace" {
name = var.k8s_namespace
}
}


1 change: 0 additions & 1 deletion modules/simphera_aws_instance/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ locals {
db_keycloak_id = "${local.instancename}-keycloak"
backup_vault_name = "${local.instancename}-backup-vault"
}

1 change: 0 additions & 1 deletion modules/simphera_aws_instance/minio-storage.tf
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,3 @@ resource "aws_s3_bucket_public_access_block" "bucket_access_block" {
ignore_public_acls = true
restrict_public_buckets = true
}

1 change: 0 additions & 1 deletion modules/simphera_aws_instance/secrets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ data "aws_secretsmanager_secret" "secrets" {
data "aws_secretsmanager_secret_version" "secrets" {
secret_id = data.aws_secretsmanager_secret.secrets.id
}

2 changes: 1 addition & 1 deletion modules/simphera_aws_instance/templates/bucket_policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
"Principal": "*"
}
]
}
}
64 changes: 32 additions & 32 deletions modules/simphera_aws_instance/templates/minio-policy.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"Version" : "2012-10-17",
"Statement" : [
{
"Effect" : "Allow",
"Action" : [
"s3:GetBucketLocation"
],
"Resource" : [
"arn:aws:s3:::*"
]
},
{
"Effect" : "Allow",
"Action" : [
"s3:PutObject",
"s3:GetObject",
"s3:ListBucket",
"s3:DeleteObject",
"s3:HeadBucket"
],
"Resource" : [
"arn:aws:s3:::${bucket}",
"arn:aws:s3:::${bucket}/*"
]
},
{
"Effect" : "Allow",
"Action" : "s3:ListAllMyBuckets",
"Resource" : "*"
}
]
}
"Version" : "2012-10-17",
"Statement" : [
{
"Effect" : "Allow",
"Action" : [
"s3:GetBucketLocation"
],
"Resource" : [
"arn:aws:s3:::*"
]
},
{
"Effect" : "Allow",
"Action" : [
"s3:PutObject",
"s3:GetObject",
"s3:ListBucket",
"s3:DeleteObject",
"s3:HeadBucket"
],
"Resource" : [
"arn:aws:s3:::${bucket}",
"arn:aws:s3:::${bucket}/*"
]
},
{
"Effect" : "Allow",
"Action" : "s3:ListAllMyBuckets",
"Resource" : "*"
}
]
}
1 change: 0 additions & 1 deletion providers.tf.example
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ provider "helm" {
#}
}
}

2 changes: 1 addition & 1 deletion templates/bucket_policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
"Principal": "*"
}
]
}
}
2 changes: 1 addition & 1 deletion templates/fluentbit_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ elasticsearch:
enabled: false

nodeSelector:
kubernetes.io/os: linux
kubernetes.io/os: linux
4 changes: 2 additions & 2 deletions templates/license_server_policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
"Effect": "Allow",
"Resource": "*",
"Sid": ""
}
}
]
}
}
Loading