Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change: [M3-7289] – Payload refinements in "Assign Linodes" flow #9845

Merged
merged 8 commits into from
Oct 31, 2023
+26 −2
Merged

change: [M3-7289] – Payload refinements in "Assign Linodes" flow #9845

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ca3746
Adjust VPC interface payload and explicitly add public interface if c…
DevDW Oct 26, 2023
d491611
Added changeset: Refine payload in subnet Assign Linodes drawer
DevDW Oct 26, 2023
b8abd21
Delete duplicate changeset
DevDW Oct 26, 2023
820c05e
Fix ipv4 property logic
DevDW Oct 26, 2023
0230de4
Merge in latest develop, resolve conflict
DevDW Oct 27, 2023
c07f965
Add explanatory comment surrounding ipv4.nat_1_1 logic
DevDW Oct 30, 2023
6b3dcfd
Merge branch 'develop' into M3-7289-assign-linodes-tweaked-payload
DevDW Oct 31, 2023
bc54e7c
Revert changes to update-database.spec.ts that came out of nowhere
DevDW Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-9845-upcoming-features-1698349552302.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Upcoming Features
---

Refine payload in subnet "Assign Linodes" drawer ([#9845](https://github.com/linode/manager/pull/9845))
2 changes: 1 addition & 1 deletion packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ export class LinodeCreate extends React.PureComponent<
];
}

const defaultPublicInterface: InterfacePayload = {
export const defaultPublicInterface: InterfacePayload = {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I briefly considered moving this to src/constants.ts, but it felt out of place there and I didn't see a better spot so I just exported it from here for now.

ipam_address: '',
label: '',
purpose: 'public',
Expand Down
18 changes: 17 additions & 1 deletion packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { Link } from 'src/components/Link';
import { Notice } from 'src/components/Notice/Notice';
import { RemovableSelectionsList } from 'src/components/RemovableSelectionsList/RemovableSelectionsList';
import { TextField } from 'src/components/TextField';
import { defaultPublicInterface } from 'src/features/Linodes/LinodesCreate/LinodeCreate';
import { useFormattedDate } from 'src/hooks/useFormattedDate';
import { useUnassignLinode } from 'src/hooks/useUnassignLinode';
import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
Expand Down Expand Up @@ -139,16 +140,31 @@ export const SubnetAssignLinodesDrawer = (

const configId = getConfigId(linodeConfigs, selectedConfig);

const configToBeModified = linodeConfigs.find(
(config) => config.id === configId
);

const interfacePayload: InterfacePayload = {
ipam_address: null,
label: null,
primary: true,
purpose: 'vpc',
subnet_id: subnet?.id,
vpc_id: vpcId,
...(!autoAssignIPv4 && { ipv4: { vpc: chosenIP } }),
...(!autoAssignIPv4 && { ipv4: { nat_1_1: 'any', vpc: chosenIP } }),
};

try {
// If the config has only an implicit public interface, make it explicit and
// add it in eth0
if (configToBeModified?.interfaces.length === 0) {
dwiley-akamai marked this conversation as resolved.
Show resolved Hide resolved
appendConfigInterface(
selectedLinode?.id ?? -1,
configId,
defaultPublicInterface
);
}

const newInterface = await appendConfigInterface(
selectedLinode?.id ?? -1,
configId,
Expand Down