fix: remove target validation entirely, any valid sdkmanager target will work

no longer requires code changes here to access new targets

Author: mikehardy

__tests__/input-validator.test.ts

@@ -1,26 +1,6 @@
 import * as validator from '../src/input-validator';
 import { MAX_PORT, MIN_PORT } from '../src/input-validator';
 
-describe('target validator tests', () => {
-  it('Throws if target is unknown', () => {
-    const func = () => {
-      validator.checkTarget('some-target');
-    };
-    expect(func).toThrowError(`Value for input.target 'some-target' is unknown. Supported options: ${validator.VALID_TARGETS}`);
-  });
-
-  it('Validates successfully with playstore target shorthands', () => {
-    const func1 = () => {
-      validator.checkTarget('playstore');
-    };
-    expect(func1).not.toThrow();
-    const func2 = () => {
-      validator.checkTarget('playstore_ps16k');
-    };
-    expect(func2).not.toThrow();
-  });
-});
-
 describe('arch validator tests', () => {
   it('Throws if arch is unknown', () => {
     const func = () => {

lib/input-validator.js

@@ -1,23 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkDiskSize = exports.checkEmulatorBuild = exports.checkEnableHardwareKeyboard = exports.checkDisableLinuxHardwareAcceleration = exports.checkDisableSpellchecker = exports.checkDisableAnimations = exports.checkPort = exports.checkForceAvdCreation = exports.checkChannel = exports.checkArch = exports.checkTarget = exports.playstoreTargetSubstitution = exports.MAX_PORT = exports.MIN_PORT = exports.VALID_CHANNELS = exports.VALID_ARCHS = exports.VALID_TARGETS = exports.MIN_API_LEVEL = void 0;
+exports.checkDiskSize = exports.checkEmulatorBuild = exports.checkEnableHardwareKeyboard = exports.checkDisableLinuxHardwareAcceleration = exports.checkDisableSpellchecker = exports.checkDisableAnimations = exports.checkPort = exports.checkForceAvdCreation = exports.checkChannel = exports.checkArch = exports.playstoreTargetSubstitution = exports.MAX_PORT = exports.MIN_PORT = exports.VALID_CHANNELS = exports.VALID_ARCHS = exports.MIN_API_LEVEL = void 0;
 exports.MIN_API_LEVEL = 15;
-exports.VALID_TARGETS = [
-    'default',
-    'google_apis',
-    'google_apis_ps16k',
-    'aosp_atd',
-    'google_atd',
-    'google_apis_playstore',
-    'google_apis_playstore_ps16k',
-    'android-wear',
-    'android-wear-cn',
-    'android-tv',
-    'google-tv',
-    'android-automotive',
-    'android-automotive-playstore',
-    'android-desktop',
-];
 exports.VALID_ARCHS = ['x86', 'x86_64', 'arm64-v8a'];
 exports.VALID_CHANNELS = ['stable', 'beta', 'dev', 'canary'];
 exports.MIN_PORT = 5554;
@@ -32,12 +16,6 @@ function playstoreTargetSubstitution(target) {
     return target;
 }
 exports.playstoreTargetSubstitution = playstoreTargetSubstitution;
-function checkTarget(target) {
-    if (!exports.VALID_TARGETS.includes(playstoreTargetSubstitution(target))) {
-        throw new Error(`Value for input.target '${target}' is unknown. Supported options: ${exports.VALID_TARGETS}.`);
-    }
-}
-exports.checkTarget = checkTarget;
 function checkArch(arch) {
     if (!exports.VALID_ARCHS.includes(arch)) {
         throw new Error(`Value for input.arch '${arch}' is unknown. Supported options: ${exports.VALID_ARCHS}.`);

lib/main.js

@@ -71,7 +71,6 @@ function run() {
             console.log(`System image API level: ${systemImageApiLevel}`);
             // target of the system image
             const target = (0, input_validator_1.playstoreTargetSubstitution)(core.getInput('target'));
-            (0, input_validator_1.checkTarget)(target);
             console.log(`target: ${target}`);
             // CPU architecture of the system image
             const arch = core.getInput('arch');

src/input-validator.ts

@@ -1,20 +1,4 @@
 export const MIN_API_LEVEL = 15;
-export const VALID_TARGETS: Array<string> = [
-  'default',
-  'google_apis',
-  'google_apis_ps16k',
-  'aosp_atd',
-  'google_atd',
-  'google_apis_playstore',
-  'google_apis_playstore_ps16k',
-  'android-wear',
-  'android-wear-cn',
-  'android-tv',
-  'google-tv',
-  'android-automotive',
-  'android-automotive-playstore',
-  'android-desktop',
-];
 export const VALID_ARCHS: Array<string> = ['x86', 'x86_64', 'arm64-v8a'];
 export const VALID_CHANNELS: Array<string> = ['stable', 'beta', 'dev', 'canary'];
 export const MIN_PORT = 5554;
@@ -28,12 +12,6 @@ export function playstoreTargetSubstitution(target: string): string {
   return target;
 }
 
-export function checkTarget(target: string): void {
-  if (!VALID_TARGETS.includes(playstoreTargetSubstitution(target))) {
-    throw new Error(`Value for input.target '${target}' is unknown. Supported options: ${VALID_TARGETS}.`);
-  }
-}
-
 export function checkArch(arch: string): void {
   if (!VALID_ARCHS.includes(arch)) {
     throw new Error(`Value for input.arch '${arch}' is unknown. Supported options: ${VALID_ARCHS}.`);

src/main.ts

@@ -1,7 +1,6 @@
 import * as core from '@actions/core';
 import { installAndroidSdk } from './sdk-installer';
 import {
-  checkTarget,
   checkArch,
   checkDisableAnimations,
   checkEmulatorBuild,
@@ -54,7 +53,6 @@ async function run() {
 
     // target of the system image
     const target = playstoreTargetSubstitution(core.getInput('target'));
-    checkTarget(target);
     console.log(`target: ${target}`);
 
     // CPU architecture of the system image