feat: add Terraform support to V2 Api gateway resources

samcli/commands/_utils/custom_options/hook_name_option.py

@@ -9,14 +9,7 @@
 import click
 
 from samcli.cli.context import Context
-from samcli.cli.global_config import GlobalConfig
 from samcli.commands._utils.constants import DEFAULT_BUILT_TEMPLATE_PATH
-from samcli.commands._utils.experimental import (
-    ExperimentalFlag,
-    prompt_experimental,
-    set_experimental,
-    update_experimental_context,
-)
 from samcli.lib.hook.exceptions import InvalidHookWrapperException
 from samcli.lib.hook.hook_wrapper import IacHookWrapper, get_available_hook_packages_ids
 from samcli.lib.telemetry.event import EventName, EventTracker
@@ -67,9 +60,6 @@ def handle_parse_result(self, ctx, opts, args):
 
         _validate_build_command_parameters(command_name, opts)
 
-        if not _check_experimental_flag(hook_name, command_name, opts, ctx.default_map):
-            return super().handle_parse_result(ctx, opts, args)
-
         try:
             self._call_prepare_hook(iac_hook_wrapper, opts, ctx)
         except Exception as ex:
@@ -149,79 +139,6 @@ def _validate_build_command_parameters(command_name, opts):
         )
 
 
-def _check_experimental_flag(hook_name, command_name, opts, default_map):
-    # check beta-feature
-    experimental_entry = ExperimentalFlag.IaCsSupport.get(hook_name)
-    beta_features = _get_customer_input_beta_features_option(default_map, experimental_entry, opts)
-
-    # check if beta feature flag is required for a specific hook package
-    # The IaCs support experimental flag map will contain only the beta IaCs. In case we support the external
-    # hooks, we need to first know that the hook package is an external, and to handle the beta feature of it
-    # using different approach
-    if beta_features is None and experimental_entry is not None:
-        iac_support_message = _get_iac_support_experimental_prompt_message(hook_name, command_name)
-        if not prompt_experimental(experimental_entry, iac_support_message):
-            LOG.debug("Experimental flag is disabled and prepare hook is not run")
-            return False
-    elif not beta_features:
-        LOG.debug("--beta-features flag is disabled and prepare hook is not run")
-        return False
-    elif beta_features:
-        LOG.debug("--beta-features flag is enabled, enabling experimental flag.")
-        set_experimental(experimental_entry, True)
-        update_experimental_context()
-    return True
-
-
-def _get_customer_input_beta_features_option(default_map, experimental_entry, opts):
-    # Get the beta-features flag value from the command parameters if provided.
-    beta_features = opts.get("beta_features")
-    if beta_features is not None:
-        return beta_features
-
-    # Get the beta-features flag value from the SamConfig file if provided.
-    beta_features = default_map.get("beta_features")
-    if beta_features is not None:
-        return beta_features
-
-    # Get the beta-features flag value from the environment variables.
-    if experimental_entry:
-        gc = GlobalConfig()
-        beta_features = gc.get_value(experimental_entry, default=None, value_type=bool, is_flag=True)
-        if beta_features is not None:
-            return beta_features
-        return gc.get_value(ExperimentalFlag.All, default=None, value_type=bool, is_flag=True)
-
-    return None
-
-
-def _get_iac_support_experimental_prompt_message(hook_name: str, command: str) -> str:
-    """
-    return the customer prompt message for a specific hook package.
-
-    Parameters
-    ----------
-    hook_name: str
-        the hook name to determine what is the supported iac
-
-    command: str
-        the current sam command
-    Returns
-    -------
-    str
-        the customer prompt message for a specific IaC.
-    """
-
-    supported_iacs_messages = {
-        "terraform": (
-            "Supporting Terraform applications is a beta feature.\n"
-            "Please confirm if you would like to proceed using AWS SAM CLI with terraform application.\n"
-            f"You can also enable this beta feature with 'sam {command} --beta-features'."
-        )
-    }
-    return supported_iacs_messages.get(hook_name, "")
-
-
 def _read_parameter_value(param_name, opts, ctx, default_value=None):
     """
     Read SAM CLI parameter value either from the parameters list or from the samconfig values

samcli/commands/build/command.py

@@ -8,7 +8,6 @@
 import click
 
 from samcli.cli.context import Context
-from samcli.commands._utils.experimental import ExperimentalFlag, is_experimental_enabled
 from samcli.commands._utils.options import (
     skip_prepare_infra_option,
     template_option_without_build,
@@ -220,13 +219,6 @@ def do_cli(  # pylint: disable=too-many-locals, too-many-statements
     """
     Implementation of the ``cli`` method
     """
-    if (
-        hook_name
-        and ExperimentalFlag.IaCsSupport.get(hook_name) is not None
-        and not is_experimental_enabled(ExperimentalFlag.IaCsSupport[hook_name])
-    ):
-        LOG.info("Terraform Support beta feature is not enabled.")
-        return
 
     from samcli.commands.build.build_context import BuildContext
 

samcli/commands/local/invoke/cli.py

@@ -9,7 +9,6 @@
 from samcli.cli.cli_config_file import ConfigProvider, configuration_option
 from samcli.cli.main import aws_creds_options, pass_context, print_cmdline_args
 from samcli.cli.main import common_options as cli_framework_options
-from samcli.commands._utils.experimental import ExperimentalFlag, is_experimental_enabled
 from samcli.commands._utils.option_value_processor import process_image_options
 from samcli.commands._utils.options import hook_name_click_option, skip_prepare_infra_option, terraform_plan_file_option
 from samcli.commands.local.cli_common.options import invoke_common_options, local_common_options
@@ -162,14 +161,6 @@ def do_cli(  # pylint: disable=R0914
     from samcli.local.docker.manager import DockerImagePullFailedException
     from samcli.local.lambdafn.exceptions import FunctionNotFound
 
-    if (
-        hook_name
-        and ExperimentalFlag.IaCsSupport.get(hook_name) is not None
-        and not is_experimental_enabled(ExperimentalFlag.IaCsSupport.get(hook_name))
-    ):
-        LOG.info("Terraform Support beta feature is not enabled.")
-        return
-
     LOG.debug("local invoke command is called")
 
     if event:

samcli/commands/local/start_api/cli.py

@@ -9,7 +9,6 @@
 from samcli.cli.cli_config_file import ConfigProvider, configuration_option
 from samcli.cli.main import aws_creds_options, pass_context, print_cmdline_args
 from samcli.cli.main import common_options as cli_framework_options
-from samcli.commands._utils.experimental import ExperimentalFlag, is_experimental_enabled
 from samcli.commands._utils.option_value_processor import process_image_options
 from samcli.commands._utils.options import (
     generate_next_command_recommendation,
@@ -186,14 +185,6 @@ def do_cli(  # pylint: disable=R0914
 
     LOG.debug("local start-api command is called")
 
-    if (
-        hook_name
-        and ExperimentalFlag.IaCsSupport.get(hook_name) is not None
-        and not is_experimental_enabled(ExperimentalFlag.IaCsSupport.get(hook_name))
-    ):
-        LOG.info("Terraform Support beta feature is not enabled.")
-        return
-
     processed_invoke_images = process_image_options(invoke_image)
 
     # Pass all inputs to setup necessary context to invoke function locally.

samcli/commands/local/start_lambda/cli.py

@@ -9,7 +9,6 @@
 from samcli.cli.cli_config_file import ConfigProvider, configuration_option
 from samcli.cli.main import aws_creds_options, pass_context, print_cmdline_args
 from samcli.cli.main import common_options as cli_framework_options
-from samcli.commands._utils.experimental import ExperimentalFlag, is_experimental_enabled
 from samcli.commands._utils.option_value_processor import process_image_options
 from samcli.commands._utils.options import (
     generate_next_command_recommendation,
@@ -169,14 +168,6 @@ def do_cli(  # pylint: disable=R0914
     from samcli.lib.providers.exceptions import InvalidLayerReference
     from samcli.local.docker.lambda_debug_settings import DebuggingNotSupported
 
-    if (
-        hook_name
-        and ExperimentalFlag.IaCsSupport.get(hook_name) is not None
-        and not is_experimental_enabled(ExperimentalFlag.IaCsSupport.get(hook_name))
-    ):
-        LOG.info("Terraform Support beta feature is not enabled.")
-        return
-
     LOG.debug("local start_lambda command is called")
 
     processed_invoke_images = process_image_options(invoke_image)

samcli/hook_packages/terraform/hooks/prepare/constants.py

@@ -23,3 +23,8 @@
 TF_AWS_API_GATEWAY_INTEGRATION = "aws_api_gateway_integration"
 TF_AWS_API_GATEWAY_AUTHORIZER = "aws_api_gateway_authorizer"
 TF_AWS_API_GATEWAY_INTEGRATION_RESPONSE = "aws_api_gateway_method_response"
+TF_AWS_API_GATEWAY_V2_API = "aws_apigatewayv2_api"
+TF_AWS_API_GATEWAY_V2_ROUTE = "aws_apigatewayv2_route"
+TF_AWS_API_GATEWAY_V2_STAGE = "aws_apigatewayv2_stage"
+TF_AWS_API_GATEWAY_V2_INTEGRATION = "aws_apigatewayv2_integration"
+TF_AWS_API_GATEWAY_V2_AUTHORIZER = "aws_apigatewayv2_authorizer"

samcli/hook_packages/terraform/hooks/prepare/exceptions.py

@@ -254,6 +254,126 @@ class GatewayMethodToGatewayAuthorizerLocalVariablesLinkingLimitationException(
     """
 
 
+class OneGatewayV2RouteToGatewayV2IntegrationLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Route linking to more than one Gateway V2 Integration
+    """
+
+
+class GatewayV2RouteToGatewayV2IntegrationLocalVariablesLinkingLimitationException(
+    LocalVariablesLinkingLimitationException
+):
+    """
+    Exception specific for Gateway V2 Route linking to Gateway V2 Integration using locals.
+    """
+
+
+class OneGatewayV2IntegrationToLambdaFunctionLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Integration linking to more than one Lambda function
+    """
+
+
+class GatewayV2IntegrationToLambdaFunctionLocalVariablesLinkingLimitationException(
+    LocalVariablesLinkingLimitationException
+):
+    """
+    Exception specific for Gateway V2 Integration linking to Lambda Function using locals.
+    """
+
+
+class OneGatewayV2IntegrationToGatewayV2ApiLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Integration linking to more than one Gateway V2 API
+    """
+
+
+class GatewayV2IntegrationToGatewayV2ApiLocalVariablesLinkingLimitationException(
+    LocalVariablesLinkingLimitationException
+):
+    """
+    Exception specific for Gateway V2 Integration linking to Gateway V2 API using locals.
+    """
+
+
+class OneGatewayV2RouteToGatewayV2ApiLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Route linking to more than one Gateway V2 API
+    """
+
+
+class GatewayV2RouteToGatewayV2ApiLocalVariablesLinkingLimitationException(LocalVariablesLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Route linking to Gateway V2 API using locals.
+    """
+
+
+class OneGatewayV2AuthorizerToLambdaFunctionLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Authorizer linking to more than one Lambda Function
+    """
+
+
+class GatewayV2AuthorizerToLambdaFunctionLocalVariablesLinkingLimitationException(
+    LocalVariablesLinkingLimitationException
+):
+    """
+    Exception specific for Gateway V2 Authorizer linking to Lambda Function using locals.
+    """
+
+
+class OneGatewayV2AuthorizerToGatewayV2ApiLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Authorizer linking to more than one Gateway V2 API
+    """
+
+
+class GatewayV2AuthorizerToGatewayV2ApiLocalVariablesLinkingLimitationException(
+    LocalVariablesLinkingLimitationException
+):
+    """
+    Exception specific for Gateway V2 Authorizer linking to Gateway V2 API using locals.
+    """
+
+
+class OneGatewayV2ApiToLambdaFunctionLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 API linking to more than one Lambda Function
+    """
+
+
+class GatewayV2ApiToLambdaFunctionLocalVariablesLinkingLimitationException(LocalVariablesLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 API linking to Lambda Function using locals.
+    """
+
+
+class OneGatewayV2StageToGatewayV2ApiLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Stage linking to more than one Gateway V2 API
+    """
+
+
+class GatewayV2StageToGatewayV2ApiLocalVariablesLinkingLimitationException(LocalVariablesLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Stage linking to Gateway V2 API using locals.
+    """
+
+
+class OneGatewayV2RouteToGatewayV2AuthorizerLinkingLimitationException(OneResourceLinkingLimitationException):
+    """
+    Exception specific for Gateway V2 Route linking to more than one Gateway V2 Authorizer
+    """
+
+
+class GatewayV2RouteToGatewayV2AuthorizerLocalVariablesLinkingLimitationException(
+    LocalVariablesLinkingLimitationException
+):
+    """
+    Exception specific for Gateway V2 Route linking to Gateway V2 Authorizer using locals.
+    """
+
+
 class InvalidSamMetadataPropertiesException(UserException):
     pass