vpc code: fix misspelled fxn name, better error handling, more tests …

…for vpc fxn
getwilds · Apr 8, 2024 · 7d6b41d · 7d6b41d
1 parent bbba9c1
commit 7d6b41d
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 40 deletions.
diff --git a/R/vpc_security_groups.R b/R/vpc_security_groups.R
@@ -8,7 +8,7 @@
 #' and [aws_vpc_security_group_ingress()]
 #' @family security groups
 #' @return (character) security group ID
-aws_vpc_sg_with_ingresss <- function(engine) {
+aws_vpc_sg_with_ingress <- function(engine) {
   sg <- aws_vpc_security_group_create(
     name = glue("{engine}-{paste0(sample(1:9, size = 4), collapse = '')}"),
     engine = engine
@@ -39,6 +39,7 @@ security_group_handler <- function(ids, engine) {
   sgsdf <- jsonlite::fromJSON(
     jsonlite::toJSON(sgs$SecurityGroups, auto_unbox = TRUE)
   )
+  if (is_empty(sgsdf)) sgsdf <- tibble(IpPermissions = list())
 
   port_df <- dplyr::filter(
     sgsdf,
@@ -56,7 +57,7 @@ security_group_handler <- function(ids, engine) {
       "Creating security group with access for ",
       "{.strong {engine}} and port {.strong {port}}"
     ))
-    trysg <- tryCatch(aws_vpc_sg_with_ingresss(engine),
+    trysg <- tryCatch(aws_vpc_sg_with_ingress(engine),
       error = function(e) e
     )
     if (rlang::is_error(trysg)) {

diff --git a/man/aws_vpc_sec_group_rules.Rd b/man/aws_vpc_sec_group_rules.Rd
diff --git a/man/aws_vpc_security_group.Rd b/man/aws_vpc_security_group.Rd
diff --git a/man/aws_vpc_security_group_create.Rd b/man/aws_vpc_security_group_create.Rd
diff --git a/man/aws_vpc_security_group_ingress.Rd b/man/aws_vpc_security_group_ingress.Rd
diff --git a/man/aws_vpc_security_groups.Rd b/man/aws_vpc_security_groups.Rd
diff --git a/man/aws_vpc_sg_with_ingresss.Rd b/man/aws_vpc_sg_with_ingresss.Rd
diff --git a/tests/testthat/test-vpc.R b/tests/testthat/test-vpc.R
@@ -124,5 +124,34 @@ test_that("aws_vpc_security_group_ingress", {
   expect_match(out$SecurityGroupRules[[1]]$GroupId, "sg-")
 })
 
+test_that("aws_vpc_sg_with_ingress", {
+  expect_error(aws_vpc_sg_with_ingress())
+
+  res <- aws_vpc_sg_with_ingress("mariadb")
+  expect_type(res, "character")
+  expect_match(res, "sg-")
+
+  out <- aws_vpc_security_group(res)
+  expect_type(out, "list")
+  expect_length(out$SecurityGroups, 1)
+  expect_match(out$SecurityGroups[[1]]$GroupName, "mariadb-")
+
+  res_mysql <- aws_vpc_sg_with_ingress("mysql")
+  out_mysql <- aws_vpc_security_group(res_mysql)
+  expect_match(out_mysql$SecurityGroups[[1]]$GroupName, "mysql-")
+})
+
+test_that("security_group_handler", {
+  # missing `id` param
+  expect_error(security_group_handler())
+  # if `id` given and not `NULL`, returns itself
+  an_id <- 123
+  expect_equal(security_group_handler(an_id), an_id)
+  # if `id` given and IS `NULL`, errors b/c `engine` missing
+  expect_error(security_group_handler(NULL))
+  # if `id` given, engine value not supported
+  expect_error(security_group_handler(NULL, engine = "asdff"))
+})
+
 # cleanup
 Sys.unsetenv("AWS_PROFILE")