[testsets] Rename misleading testset names, adjust subnet matching

Tool: gitpod/catfood.gitpod.cloud

Author: geropl

gitpod-network-check/README.md

@@ -34,17 +34,20 @@ A CLI to check if your network setup is suitable for the installation of Gitpod.
 
 1. Preparation
 
-   To run a diagnosis of the network that you want to use for Gitpod, the CLI command needs to know the subnets you have chosen to be used as the `Main` subnets and the `Pod` subnets. You can read more about the distinction here in [our docs](https://www.gitpod.io/docs/enterprise/getting-started/networking#2-subnet-separation). The CLI expects to read the IDs of these subnets in a configuration file. By default it tries to read it from a file name `gitpod-network-check.yaml` in your current directory, but you can override this behavior by using the `--config` flag of the CLI.
+   To run a diagnosis of the network that you want to use for Gitpod, the CLI command needs to know the subnets you have chosen to be used as the `Main` subnets. You can read more about those here in [our docs](https://www.gitpod.io/docs/enterprise/getting-started/networking#2-subnet-separation). The CLI expects to read the IDs of these subnets in a configuration file. By default it tries to read it from a file name `gitpod-network-check.yaml` in your current directory, but you can override this behavior by using the `--config` flag of the CLI.
 
    For the sake of simplicity, let us create a file `gitpod-network-check.yaml` in the current directory and populate it with the subnet IDs and AWS region as shown below:
    ```yaml
    log-level: debug # Options: debug, info, warning, error
    region: eu-central-1
    main-subnets: subnet-0554e84f033a64c56, subnet-08584621e7754e505, subnet-094c6fd68aea493b7
-   pod-subnets: subnet-028d11dce93b8eefc, subnet-04ec8257d95c434b7,subnet-00a83550ce709f39c
    https-hosts: accounts.google.com, github.com
-   instance-ami: # put your custom ami id here if you want to use it, otherwise it will using latest ubuntu AMI from aws
    api-endpoint: # optional, put your API endpoint regional sub-domain here to test connectivity, like when the execute-api vpc endpoint is not in the same account as Gitpod
+
+   ## EC2 runner
+   #instance-ami: # put your custom ami id here if you want to use it, otherwise it will using latest ubuntu AMI from aws
+
+   ## Lambda runner
    # lambda-role-arn: arn:aws:iam::123456789012:role/MyExistingLambdaRole # Optional: Use existing IAM Role for Lambda mode
    # lambda-sg-id: sg-0123456789abcdef0 # Optional: Use existing Security Group for Lambda mode
    ```

gitpod-network-check/cmd/root.go

@@ -131,7 +131,8 @@ func init() {
 	NetworkCheckCmd.PersistentFlags().StringSliceVar(&NetworkConfig.HttpsHosts, "https-hosts", []string{}, "Hosts to test for outbound HTTPS connectivity")
 	NetworkCheckCmd.PersistentFlags().StringVar(&NetworkConfig.InstanceAMI, "instance-ami", "", "Custom ec2 instance AMI id, if not set will use latest ubuntu")
 	NetworkCheckCmd.PersistentFlags().StringVar(&NetworkConfig.ApiEndpoint, "api-endpoint", "", "The Gitpod Enterprise control plane's regional API endpoint subdomain")
-	NetworkCheckCmd.PersistentFlags().StringSliceVar(&Flags.SelectedTestsets, "testsets", []string{"aws-services-pod-subnet", "aws-services-main-subnet", "https-hosts-main-subnet"}, "List of testsets to run (options: aws-services-pod-subnet, aws-services-main-subnet, https-hosts-main-subnet)")
+	testsetOptions := []string{string(checks.TestsetNameAwsServicesApp), string(checks.TestSetNameAwsServicesSubstrate), string(checks.TestSetNameHttpsHosts)}
+	NetworkCheckCmd.PersistentFlags().StringSliceVar(&Flags.SelectedTestsets, "testsets", testsetOptions, fmt.Sprintf("List of testsets to run (options: %v)", testsetOptions))
 	// Rename flag, variable, and update help text
 	NetworkCheckCmd.PersistentFlags().StringVar(&Flags.RunnerTypeStr, "runner", string(runner.RunnerTypeEC2), fmt.Sprintf("Specify the runner for executing tests (default: %s, options: %s, %s, %s)", runner.RunnerTypeEC2, runner.RunnerTypeEC2, runner.RunnerTypeLambda, runner.RunnerTypeLocal))
 	// Lambda-specific flags

gitpod-network-check/pkg/checks/types.go

@@ -40,9 +40,9 @@ func (nc *NetworkConfig) GetAllSubnets() []Subnet {
 type TestsetName string
 
 const (
-	TestsetNameAwsServicesPodSubnet  TestsetName = "aws-services-pod-subnet"
-	TestSetNameAwsServicesMainSubnet TestsetName = "aws-services-main-subnet"
-	TestSetNameHttpsHostsMainSubnet  TestsetName = "https-hosts-main-subnet"
+	TestsetNameAwsServicesApp       TestsetName = "aws-services-app"
+	TestSetNameAwsServicesSubstrate TestsetName = "aws-services-substrate"
+	TestSetNameHttpsHosts           TestsetName = "https-hosts"
 )
 
 type SubnetType string
@@ -79,10 +79,11 @@ func (sns Subnets) String() string {
 	return strings.Join(result, ", ")
 }
 
+// TODO(gpl) We should re-consider the assignment of the subnet type to a test-set. For BYON, it's actually only all from main only.
 type TestSet func(networkConfig *NetworkConfig) (endpoints map[string]string, subnetType SubnetType)
 
 var TestSets = map[TestsetName]TestSet{
-	TestsetNameAwsServicesPodSubnet: func(networkConfig *NetworkConfig) (map[string]string, SubnetType) {
+	TestsetNameAwsServicesApp: func(networkConfig *NetworkConfig) (map[string]string, SubnetType) {
 		return map[string]string{
 			"SSM":                   fmt.Sprintf("https://ssm.%s.amazonaws.com", networkConfig.AwsRegion),
 			"SSMmessages":           fmt.Sprintf("https://ssmmessages.%s.amazonaws.com", networkConfig.AwsRegion),
@@ -99,19 +100,21 @@ var TestSets = map[TestsetName]TestSet{
 			"Sts":                   fmt.Sprintf("https://sts.%s.amazonaws.com", networkConfig.AwsRegion),
 			"ECR Api":               fmt.Sprintf("https://api.ecr.%s.amazonaws.com", networkConfig.AwsRegion),
 			"ECR":                   fmt.Sprintf("https://869456089606.dkr.ecr.%s.amazonaws.com", networkConfig.AwsRegion),
-		}, SubnetTypePod
+		}, SubnetTypeMain
 	},
-	TestSetNameAwsServicesMainSubnet: func(networkConfig *NetworkConfig) (map[string]string, SubnetType) {
+	TestSetNameAwsServicesSubstrate: func(networkConfig *NetworkConfig) (map[string]string, SubnetType) {
 		endpoints := map[string]string{
 			"S3":       fmt.Sprintf("https://s3.%s.amazonaws.com", networkConfig.AwsRegion),
 			"DynamoDB": fmt.Sprintf("https://dynamodb.%s.amazonaws.com", networkConfig.AwsRegion),
 		}
 		if networkConfig.ApiEndpoint != "" {
 			endpoints["ExecuteAPI"] = fmt.Sprintf("https://%s.execute-api.%s.amazonaws.com", networkConfig.ApiEndpoint, networkConfig.AwsRegion)
+		} else {
+			log.Warnf("🚧 No execute-api endpoint provided, skipping test")
 		}
 		return endpoints, SubnetTypeMain
 	},
-	TestSetNameHttpsHostsMainSubnet: func(networkConfig *NetworkConfig) (map[string]string, SubnetType) {
+	TestSetNameHttpsHosts: func(networkConfig *NetworkConfig) (map[string]string, SubnetType) {
 		endpoints := map[string]string{}
 		for _, v := range networkConfig.HttpsHosts {
 			host := strings.TrimSpace(v)