Skip to content

Replace gp2 with gp3 - #1606

Open
wing-utm-sharing-airspace wants to merge 2 commits into
interuss:masterfrom
wing-utm-sharing-airspace:gp3
Open

Replace gp2 with gp3#1606
wing-utm-sharing-airspace wants to merge 2 commits into
interuss:masterfrom
wing-utm-sharing-airspace:gp3

Conversation

@wing-utm-sharing-airspace

@wing-utm-sharing-airspace wing-utm-sharing-airspace commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

gp2 currently is slower and more expensive.

@linux-foundation-easycla

linux-foundation-easycla Bot commented Jul 29, 2026

Copy link
Copy Markdown

CLA Signed
The committers listed above are authorized under a signed CLA.

  • ✅ login: wing-utm-sharing-airspace / name: Fahim Zubayer (9a93388)

@the-glu the-glu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

gp2/gp3 changes looks good, I'm not sure about script generation changes and the diff. Maybe consider a separate PR to split concerns?

INTERNAL_VARIABLES_FILENAME = "variables_internal.tf"
GENERATED_COMMENT = """
# This file has been automatically generated by /deploy/infrastructure/utils/generate_terraform_variables.py.
# This file has been automatically generated by /deploy/infrastructure/utils/variables.py.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why the change? Isen't generate_terraform_variables the script to ran?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

There doesn't seem to be a generate_terraform_variables.py. As in an explicit python script

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

What I mean is, I ran the variables.py script, which is what the generate_terraform_variables bash script runs, right?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

So what I always do is run ./generate_terraform_variables.sh in the folder, who run variables.py.

This will run it with explicit version of the package needed with the docker image.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I appreciate the explanation. I misunderstood the comment in the py file. I should have read the official documentation :)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

No worries. I checked since it probably mean latest version of the library introduced some change and created #1609 to upgrade it.


declared_var_name = list(variables[0].keys())[0]
if declared_var_name != variable_name:
if declared_var_name.strip('"') != variable_name:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this really correct? The same should be the same including spaces no?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

So, when I ran it, I got an error that showed declared_var_name with quotes. Would it be possible for you to check?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

When running generation on your branch with ./generate_terraform_variables.sh, it does seems to be working for me.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thank you for taking the time to verify. TIL how to generate the files correctly.

Comment thread deploy/infrastructure/modules/terraform-google-dss/TFVARS.gen.md Outdated
@wing-utm-sharing-airspace wing-utm-sharing-airspace changed the title Replace gp2 with gp3 and minor script modification Replace gp2 with gp3 Jul 30, 2026

@the-glu the-glu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM now, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

2 participants