Skip to content

Validate username and password early #104

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

Merged
martinbonnin merged 3 commits into from
Jun 25, 2025
Merged

Validate username and password early #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d6368a
Validate username and password early
martinbonnin Jun 24, 2025
4281f47
use hasTask
martinbonnin Jun 25, 2025
554b1fa
use allTasks
martinbonnin Jun 25, 2025
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: 1 addition & 4 deletions src/main/kotlin/nmcp/internal/DefaultNmcpAggregationExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,10 @@ abstract class DefaultNmcpAggregationExtension(private val project: Project) : N
private val lenientFiles = consumerConfiguration.incoming.artifactView { it.lenient(true) }.files

override fun centralPortal(action: Action<CentralPortalOptions>) {
val centralPortalOptions = project.objects.newInstance(CentralPortalOptions::class.java)
action.execute(centralPortalOptions)

project.registerPublishToCentralPortalTasks(
name = "aggregation",
inputFiles = lenientFiles,
spec = centralPortalOptions
action = action
)
}

Expand Down
5 changes: 1 addition & 4 deletions src/main/kotlin/nmcp/internal/DefaultNmcpExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,10 @@ open class DefaultNmcpExtension(private val project: Project): NmcpExtension {
}

override fun publishAllPublicationsToCentralPortal(action: Action<CentralPortalOptions>) {
val centralPortalOptions = project.objects.newInstance(CentralPortalOptions::class.java)
action.execute(centralPortalOptions)

project.registerPublishToCentralPortalTasks(
name = "allPublications",
inputFiles = m2Files,
spec = centralPortalOptions
action = action
)
}
}
18 changes: 17 additions & 1 deletion src/main/kotlin/nmcp/internal/utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ package nmcp.internal

import gratatouille.wiring.capitalizeFirstLetter
import nmcp.CentralPortalOptions
import nmcp.internal.task.NmcpPublishWithPublisherApiTask
import nmcp.internal.task.registerNmcpPublishFileByFileTask
import nmcp.internal.task.registerNmcpPublishWithPublisherApiTask
import org.gradle.api.Action
import org.gradle.api.Named
import org.gradle.api.Project
import org.gradle.api.attributes.Attribute
Expand Down Expand Up @@ -46,8 +48,10 @@ internal fun HasConfigurableAttributes<*>.configureAttributes(project: Project)
internal fun Project.registerPublishToCentralPortalTasks(
name: String,
inputFiles: FileCollection,
spec: CentralPortalOptions,
action: Action<CentralPortalOptions>,
) {
val spec = objects.newInstance(CentralPortalOptions::class.java)
action.execute(spec)

val releaseTaskName = "nmcpPublish${name.capitalizeFirstLetter()}ToCentralPortal"
val snapshotTaskName = "nmcpPublish${name.capitalizeFirstLetter()}ToCentralPortalSnapshots"
Expand Down Expand Up @@ -90,5 +94,17 @@ internal fun Project.registerPublishToCentralPortalTasks(
it.dependsOn(snapshots)
}
}

project.gradle.taskGraph.whenReady {
if (it.allTasks.any { it is NmcpPublishWithPublisherApiTask }) {
check(spec.username.isPresent) {
"Nmcp: username is missing"
}
check(spec.password.isPresent) {
"Nmcp: password is missing"
}
}
}
}