Skip to content

Commit 57ea16c

Browse files
authored
Merge pull request #4 from aws-samples/feature/v1.1
Feature/v1.1
2 parents cde4d41 + 63b3c7f commit 57ea16c

File tree

234 files changed

+1304
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+1304
-618
lines changed

.gitignore

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ cdk.out
1919
.terraform/**/*
2020
terraform.tfstate
2121
terraform.tfstate.backup
22+
.aider*\
2223

2324
# CCAAS Tool Exports
2425
exports/**/*

.gitlab-ci.yml

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ assume-role-test:
6969
# include: amzconnect-supporting-infra/.gitlab-ci.yml
7070
# strategy: depend
7171
# rules:
72-
# - changes: [amzconnect-supporting-infra/**/*]
72+
# - changes: [amzconnect-supporting-infra/**/*, imports/resources/bots/**/*]
7373

7474
# contact-flows:
7575
# stage: parent
7676
# trigger:
7777
# include: amzconnect-contact-flows/.gitlab-ci.yml
7878
# strategy: depend
7979
# rules:
80-
# - changes: [amzconnect-contact-flows/**/*, imports/resources/flows/**/*]
80+
# - changes: [amzconnect-contact-flows/**/*, imports/resources/flows/**/*, imports/resources/bots/**/*]

.tflint.hcl

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# https://github.com/terraform-linters/tflint/blob/master/docs/user-guide/module-inspection.md
2+
# borrowed & modified indefinitely from https://github.com/ksatirli/building-infrastructure-you-can-mostly-trust/blob/main/.tflint.hcl
3+
4+
plugin "aws" {
5+
enabled = true
6+
version = "0.38.0"
7+
source = "github.com/terraform-linters/tflint-ruleset-aws"
8+
}
9+
10+
rule "terraform_required_providers" {
11+
enabled = true
12+
}
13+
14+
rule "terraform_required_version" {
15+
enabled = true
16+
}
17+
18+
rule "terraform_typed_variables" {
19+
enabled = true
20+
}
21+
22+
rule "terraform_unused_declarations" {
23+
enabled = true
24+
}
25+
26+
rule "terraform_comment_syntax" {
27+
enabled = true
28+
}
29+
30+
rule "terraform_deprecated_index" {
31+
enabled = true
32+
}
33+
34+
rule "terraform_deprecated_interpolation" {
35+
enabled = true
36+
}
37+
38+
rule "terraform_documented_outputs" {
39+
enabled = true
40+
}
41+
42+
rule "terraform_documented_variables" {
43+
enabled = true
44+
}
45+
46+
rule "terraform_module_pinned_source" {
47+
enabled = true
48+
}
49+
50+
rule "terraform_standard_module_structure" {
51+
enabled = true
52+
}
53+
54+
rule "terraform_workspace_remote" {
55+
enabled = true
56+
}
57+
58+
rule "aws_ssm_parameter_invalid_name" {
59+
enabled = false
60+
}

CHANGELOG.md

100644100755
Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,28 @@ All notable changes to this project will be documented in this file. Considerabl
55
This project follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format for changes and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77

8+
## [v1.1 06/11/2025]
89

9-
## [Unreleased]
10+
Core Enhancements
11+
12+
Enhanced CCaaS Export tool with Lex bot and Connect views support
13+
Added multi-locale bot support with English and Spanish
14+
Improved environment-specific deployment configurations
15+
16+
Infrastructure Updates
17+
18+
Rearchitected Lex bot deployment with better versioning and alias handling
19+
Enhanced Connect admin objects with views support
20+
Optimized contact flow templates and deployment
21+
Added TFLint configuration for improved code quality
22+
23+
DevOps Improvements
24+
25+
Enhanced IAM permissions for service-linked roles
26+
Streamlined deployment process for infrastructure components
27+
28+
29+
## [v1.0 01/28/2025]
30+
Initial
1031

1132

CODE_OF_CONDUCT.md

100644100755
File mode changed.

CONTRIBUTING.md

100644100755
File mode changed.

LICENSE

100644100755
File mode changed.

README.md

100644100755
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Amazon Connect DevOps using Terraform and GitLab - New and Re-Architected Version
22

3-
## What's New in This Guide
3+
## What's New in this Guide
44

55
The original Amazon Connect CI/CD workshop has been revamped to create a more comprehensive, structured, and user-friendly implementation experience. Key improvements include:
66

77
- **Clearer Architecture Layout**: Enhanced documentation of the five core pipelines (connect-instance, admin-objects, supporting-infra, lambdas, and contact-flows) with improved diagrams and explanations
8-
- **New Export Utility Documentation**: Added detailed coverage of the AWS CCaaS Export Utility, making it easier to export and migrate existing Connect configurations
8+
- **New Export Utility Documentation**: Added detailed coverage of the AWS CCaaS Export Utility, making it easier to export and migrate existing Amazon Connect configurations
99
- **Enhanced Security Guidance**: Added important security notes and best practices for production implementations
1010
- **Streamlined Configuration Steps**: Reorganized the GitLab setup process with clearer prerequisites and step-by-step instructions
1111
- **Environment-Specific Configurations**: New section on handling outbound caller ID mappings across different environments
@@ -34,8 +34,8 @@ There will be five pipelines deployed
3434

3535
- amzconnect-instance pipeline which creates the Amazon Connect instance itself.
3636
- amzconnect-admin-objects which will create items that live within Connect such as users, queues, hours of operations, and profiles
37-
- amzconnect-supporting-infra pipeline which creates supporting architectures such as a lex v2 bot, s3 buckets, and any other resource which is not primarily code.
38-
- amzconnect-lambdas pipeline which creates all associated lambda functions and layers. This is separate so that appropriate testing and security patterns can be run against the code itself.
37+
- amzconnect-supporting-infra pipeline which creates supporting architectures such as a Amazon Lex v2, Amazon S3 buckets, and any other resource which is not primarily code.
38+
- amzconnect-lambdas pipeline which creates all associated Lambda functions and layers. This is separate so that appropriate testing and security patterns can be run against the code itself.
3939
- amzconnect-contact-flows pipeline which deploys the Amazon Connect contact flows themselves to the instance.
4040

4141
![[tfcicd-pipelines.png]](./docs/ReferenceImplementation/images/tfcicd-pipelines.png)
@@ -53,3 +53,5 @@ The code exists in a monorepo with folders for each of the pipelines as well a f
5353
- [Conclusion](<docs/ReferenceImplementation/06 Conclusion.md>)
5454
- DevOps Best Practices
5555
- [Recommendations](docs/BestPractices/Recommendations.md)
56+
- AWS Internal
57+
- [How to configure your environment to use the AWS GitLab repository](docs/AWSInternal/HowToAWSGitLab.md)

SECURITY.md

100644100755
File mode changed.

amzconnect-admin-objects/.gitlab-ci.yml

100644100755
File mode changed.

0 commit comments

Comments
 (0)