From 6d048d8e1091a3a062a742051cae7eb2781b4bb8 Mon Sep 17 00:00:00 2001
From: Zhihe Li <zhihe.li@hashicorp.com>
Date: Mon, 9 Jan 2023 12:35:42 -0500
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Update=20target=20mo?=
 =?UTF-8?q?del=20for=20address=20(#1557)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: ICU-7489
---
 addons/api/addon/generated/models/target.js      | 6 ++++++
 addons/api/mirage/scenarios/default.js           | 1 +
 addons/api/tests/unit/serializers/target-test.js | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/addons/api/addon/generated/models/target.js b/addons/api/addon/generated/models/target.js
index 405f6c97a..acccb3ebe 100644
--- a/addons/api/addon/generated/models/target.js
+++ b/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;
 }
diff --git a/addons/api/mirage/scenarios/default.js b/addons/api/mirage/scenarios/default.js
index 7ce918221..0eb770da2 100644
--- a/addons/api/mirage/scenarios/default.js
+++ b/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
diff --git a/addons/api/tests/unit/serializers/target-test.js b/addons/api/tests/unit/serializers/target-test.js
index 29864c838..8368dce74 100644
--- a/addons/api/tests/unit/serializers/target-test.js
+++ b/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,
     });
   });
 

From 73be8268a69fdcf0ee2c17dd69093c707662c2c2 Mon Sep 17 00:00:00 2001
From: Zhihe Li <zhihe.li@hashicorp.com>
Date: Mon, 9 Jan 2023 13:41:20 -0500
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20feature=20fla?=
 =?UTF-8?q?g=20for=20target=20network=20address=20feature=20(#1558)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: ICU-7493
---
 ui/admin/config/environment.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index b4f99660a..2ec104214 100644
--- a/ui/admin/config/environment.js
+++ b/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') {