Merge pull request #18 from hashicorp/oss/merge-main-73be8268a69fdcf0ee2c17dd69093c707662c2c2

[main] OSS to ENT merge of (73be826)

addons/api/addon/generated/models/target.js

@@ -60,4 +60,10 @@ export default class GeneratedTargetModel extends BaseModel {
     description: 'Current version number of this resource.',
   })
   version;
+
+  @attr('string', {
+    description:
+      'An IP address or DNS name for the session to connect to. Cannot be used in conjunction with host sources.',
+  })
+  address;
 }

addons/api/mirage/scenarios/default.js

@@ -94,6 +94,7 @@ export default function (server) {
     server.createList('host-catalog', 8, { scope }, 'withChildren');
     server.createList('credential-store', 3, { scope }, 'withAssociations');
     server.createList('target', 2, { scope }, 'withAssociations');
+    server.create('target', { scope, address: '0.0.0.0' });
     // Sessions have target data. Create it after targets.
     server.createList('session', 4, { scope }, 'withAssociations');
     // Create IAM resources for project

addons/api/tests/unit/serializers/target-test.js

@@ -28,6 +28,7 @@ module('Unit | Serializer | target', function (hooks) {
       default_port: 1234,
       version: 1,
       type: TYPE_TARGET_TCP,
+      address: '0.0.0.0',
     });
     const snapshot = record._createSnapshot();
     snapshot.adapterOptions = {};
@@ -44,6 +45,7 @@ module('Unit | Serializer | target', function (hooks) {
       attributes: {
         default_port: 1234,
       },
+      address: '0.0.0.0',
     });
   });
 
@@ -146,6 +148,7 @@ module('Unit | Serializer | target', function (hooks) {
       attributes: {
         default_port: 1234,
       },
+      address: null,
     });
   });
 

ui/admin/config/environment.js

@@ -16,6 +16,7 @@ const featureEditions = {
     'target-worker-filters-v2': false,
     'target-worker-filters-v2-ingress': false,
     'target-worker-filters-v2-hcp': false,
+    'target-network-address': false,
   },
 };
 featureEditions.enterprise = {
@@ -147,6 +148,7 @@ module.exports = function (environment) {
     ENV.featureFlags['ssh-target'] = true;
     ENV.featureFlags['vault-worker-filter'] = true;
     ENV.featureFlags['target-worker-filters-v2'] = true;
+    ENV.featureFlags['target-network-address'] = true;
   }
 
   if (environment === 'test') {
@@ -171,6 +173,7 @@ module.exports = function (environment) {
     ENV.featureFlags['ssh-target'] = true;
     ENV.featureFlags['vault-worker-filter'] = true;
     ENV.featureFlags['target-worker-filters-v2'] = true;
+    ENV.featureFlags['target-network-address'] = true;
   }
 
   if (environment === 'production') {