Skip to content

fix issue 1793#1798

Merged
k8s-ci-robot merged 1 commit intokubernetes:mainfrom
sosan:fix-issue-1793
Feb 1, 2024
Merged

fix issue 1793#1798
k8s-ci-robot merged 1 commit intokubernetes:mainfrom
sosan:fix-issue-1793

Conversation

@sosan
Copy link
Copy Markdown
Contributor

@sosan sosan commented Jan 9, 2024

What type of PR is this?
/kind bug

Which issue(s) this PR fixes:

Special notes for your reviewer:

  • Created new function checkUsableNameEnvFile

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jan 9, 2024
@linux-foundation-easycla
Copy link
Copy Markdown

linux-foundation-easycla bot commented Jan 9, 2024 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: sosan / name: Jose Luis (578fa72)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Jan 9, 2024
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 9, 2024

Welcome @sosan!

It looks like this is your first PR to kubernetes/kompose 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kompose has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot requested review from hangyan and sebgoa January 9, 2024 19:56
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jan 9, 2024
@AhmedGrati
Copy link
Copy Markdown
Contributor

AhmedGrati commented Jan 13, 2024

@sosan thanks for working on this. You should update files in script/test/fixtures to make the e2e tests pass.

AhmedGrati
AhmedGrati suggested changes Jan 13, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@AhmedGrati AhmedGrati left a comment

Choose a reason for hiding this comment

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

Thanks for working on this. Left some comments below!

pkg/transformer/kubernetes/k8sutils.go Outdated
Comment on lines 901 to 903
if len(envName) > 63 {
envName = envName[len(envName)-63:]
}
Copy link
Copy Markdown
Contributor

@AhmedGrati AhmedGrati Jan 13, 2024

Choose a reason for hiding this comment

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

I think that we should delete this bloc here

Copy link
Copy Markdown
Contributor Author

@sosan sosan Jan 14, 2024

Choose a reason for hiding this comment

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

applied

Copy link
Copy Markdown
Contributor Author

@sosan sosan Jan 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

from k8sutils_test.go this test gets last 63 characters

{
			name: "check that ./ is removed",
			args: args{
				name: "abcdefghijklnmopqrstuvxyzabcdefghijklmnopqrstuvwxyzabcdejghijkl$Hereisadditional",
			},
			want: "rstuvxyzabcdefghijklmnopqrstuvwxyzabcdejghijkl$Hereisadditional",
		},

and gets affected by this removed code:

if len(envName) > 63 {
		envName = envName[len(envName)-63:]
	}

@cdrage
Copy link
Copy Markdown
Member

cdrage commented Jan 15, 2024

The code LGTM. Are you able to add some fixture tests?

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 22, 2024
@sosan
Copy link
Copy Markdown
Contributor Author

sosan commented Jan 22, 2024

@cdrage rebased

@AhmedGrati
Copy link
Copy Markdown
Contributor

AhmedGrati commented Jan 23, 2024

@sosan For some reason your rebase went wrong.

@sosan
Copy link
Copy Markdown
Contributor Author

sosan commented Jan 24, 2024

@AhmedGrati done :)

@cdrage
Copy link
Copy Markdown
Member

cdrage commented Jan 24, 2024

@AhmedGrati done :)

looks like something still went wrong.. over 30 commits in this PR? Maybe your main branch isn't synced to the upstream kubernetes/kompose branch?

@sosan
fix issue 1793
578fa72 
* fix issue 1793  kubernetes#1793
*add tests

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

formated k8utils_test.go

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

labels formatted as name"-"envName to match fixtures when performing the gitHub action

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

removed this piece code because apply it later, and it is redundant

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

Refactor test in k8sutils_test.go to extract the last 63 characters. This addresses the impact of the removed code that previously truncated the input with if len(envName) > 63 { envName = envName[len(envName)-63:] }

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

changed to name function to getUsableNameEnvFile

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

fix issue 1793

* fix issue 1793  kubernetes#1793
*add tests

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

labels formatted as name"-"envName to match fixtures when performing the gitHub action

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

changed to name function to getUsableNameEnvFile

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 24, 2024
@sosan
Copy link
Copy Markdown
Contributor Author

sosan commented Jan 24, 2024

@cdrage squashed and rebased again :)

@cdrage
Copy link
Copy Markdown
Member

cdrage commented Feb 1, 2024

/approve

@cdrage
Copy link
Copy Markdown
Member

cdrage commented Feb 1, 2024

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 1, 2024
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Feb 1, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cdrage, sosan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 1, 2024
@k8s-ci-robot k8s-ci-robot merged commit 52e5dbd into kubernetes:main Feb 1, 2024
@BrewTestBot BrewTestBot mentioned this pull request Apr 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hangyan hangyan Awaiting requested review from hangyan

@sebgoa sebgoa Awaiting requested review from sebgoa

1 more reviewer

@AhmedGrati AhmedGrati AhmedGrati requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

@cdrage cdrage

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG] Conflicting name assigned to configmap generated for compose referencing ".env" files

4 participants

@sosan @k8s-ci-robot @AhmedGrati @cdrage