Merge pull request #15499 from jack-w-shaw/JUJU-3488_rename_expose_ec…

…2_to_firewall

#15499

In future versions more firewall related tests have be added

Change the name here to keep the suite names consistent

## Checklist

- ~[ ] Code style: imports ordered, good names, simple structure, etc~
- ~[ ] Comments saying why design decisions were made~
- ~[ ] Go unit tests, with comments saying what you're testing~
- [x] [Integration tests](https://github.com/juju/juju/tree/develop/tests), with comments saying what you're testing
- ~[ ] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~

## QA steps

```sh
./main.sh -v -c aws -p ec2 firewall
```

tests/main.sh

@@ -53,7 +53,7 @@ TEST_NAMES="agents \
             deploy \
             deploy_aks \
             deploy_caas \
-            expose_ec2 \
+			firewall \
             hooks \
             hooktools \
 			kubeflow \

tests/suites/expose_ec2/bundle_with_exposed_endpoints.sh → tests/suites/firewall/bundle_with_exposed_endpoints.sh

@@ -13,7 +13,7 @@ run_bundle_with_exposed_endpoints() {
 assert_deploy_bundle_with_expose_flag_and_exposed_endpoints_fails() {
 	echo "==> Checking that deploying a bundle with both the expose flag and exposed endpoint sections is not allowed"
 
-	bundle=./tests/suites/expose_ec2/bundles/invalid.yaml
+	bundle=./tests/suites/firewall/bundles/invalid.yaml
 	got=$(juju deploy ${bundle} 2>&1 || true)
 	check_contains "${got}" 'exposed-endpoints cannot be specified together with "exposed:true" in application "ubuntu-lite" as this poses a security risk when deploying bundles to older controllers'
 }

tests/suites/firewall/task.sh

@@ -0,0 +1,20 @@
+test_firewall() {
+	if [ "$(skip 'test_firewall')" ]; then
+		echo "==> TEST SKIPPED: firewall tests"
+		return
+	fi
+
+	set_verbosity
+
+	echo "==> Checking for dependencies"
+	check_dependencies juju aws
+
+	file="${TEST_DIR}/test-firewall.log"
+
+	bootstrap "test-firewall" "${file}"
+
+	test_expose_app_ec2
+	test_bundle_with_exposed_endpoints
+
+	destroy_controller "test-firewall"
+}