Merge pull request #429 from apache/feature/bsky.domain.name

Added Bsky atproto-did to identify @grails.apache.org as BSky account name

Author: matrei

buildSrc/src/main/groovy/website/gradle/GrailsWebsiteExtension.groovy

@@ -18,10 +18,7 @@
  */
 package website.gradle
 
-import javax.inject.Inject
-
 import groovy.transform.CompileStatic
-
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.file.RegularFileProperty
@@ -30,17 +27,21 @@ import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.ProviderFactory
 
+import javax.inject.Inject
+
 @CompileStatic
 class GrailsWebsiteExtension {
 
     public static final String NAME = 'grailsWebsite'
 
     final RegularFileProperty htaccess
+    final RegularFileProperty bskyAtProtoDid
     final RegularFileProperty modules
     final RegularFileProperty profiles
     final RegularFileProperty questions
     final RegularFileProperty releases
     final RegularFileProperty template
+    final RegularFileProperty social
 
     final DirectoryProperty assetsDir
     final DirectoryProperty minutesDir
@@ -61,6 +62,9 @@ class GrailsWebsiteExtension {
         htaccess = objects.fileProperty()
         htaccess.convention(layout.buildDirectory.file('dist/.htaccess'))
 
+        bskyAtProtoDid = objects.fileProperty()
+        bskyAtProtoDid.convention(layout.buildDirectory.file('dist/.well-known/atproto-did'))
+
         modules = objects.fileProperty()
         modules.convention(layout.projectDirectory.file('conf/modules.yml'))
 
@@ -73,6 +77,9 @@ class GrailsWebsiteExtension {
         releases = objects.fileProperty()
         releases.convention(layout.projectDirectory.file('conf/releases.yml'))
 
+        social = objects.fileProperty()
+        social.convention(layout.projectDirectory.file('conf/social.yml'))
+
         template = objects.fileProperty()
         template.convention(layout.projectDirectory.file('templates/document.html'))
 
@@ -104,8 +111,8 @@ class GrailsWebsiteExtension {
 
         url = objects.property(String)
         url.convention(
-            providers.environmentVariable('GRAILS_WS_URL')
-                .orElse('https://grails.apache.org')
+                providers.environmentVariable('GRAILS_WS_URL')
+                        .orElse('https://grails.apache.org')
         )
 
         // List property with convention

buildSrc/src/main/groovy/website/gradle/GrailsWebsitePlugin.groovy

@@ -25,6 +25,7 @@ import org.gradle.api.Project
 
 import website.gradle.tasks.AssetsTask
 import website.gradle.tasks.BlogTask
+import website.gradle.tasks.BskyAtProtoDidTask
 import website.gradle.tasks.DocumentationTask
 import website.gradle.tasks.DownloadTask
 import website.gradle.tasks.GrailsWebsiteTask
@@ -55,6 +56,7 @@ class GrailsWebsitePlugin implements Plugin<Project> {
         DownloadTask.register(project, siteExt)
         GuidesTask.register(project, siteExt)
         HtaccessTask.register(project, siteExt)
+        BskyAtProtoDidTask.register(project, siteExt)
         MinutesTask.register(project, siteExt)
         PluginsTask.register(project, siteExt)
         ProfilesTask.register(project, siteExt)
@@ -68,6 +70,7 @@ class GrailsWebsitePlugin implements Plugin<Project> {
             it.dependsOn(MinutesTask.NAME)
             it.dependsOn(PluginsTask.NAME)
             it.dependsOn(HtaccessTask.NAME)
+            it.dependsOn(BskyAtProtoDidTask.NAME)
         }
 
         RenderSiteTask.register(project, siteExt).configure {
@@ -85,6 +88,7 @@ class GrailsWebsitePlugin implements Plugin<Project> {
             it.finalizedBy(BlogTask.NAME)
             it.finalizedBy(MinutesTask.NAME)
             it.finalizedBy(HtaccessTask.NAME)
+            it.finalizedBy(BskyAtProtoDidTask.NAME)
             it.finalizedBy(PluginsTask.NAME)
             it.finalizedBy(SitemapTask.NAME)
         }

buildSrc/src/main/groovy/website/gradle/tasks/BskyAtProtoDidTask.groovy

@@ -0,0 +1,83 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package website.gradle.tasks
+
+import groovy.transform.CompileStatic
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.TaskProvider
+import org.yaml.snakeyaml.Yaml
+import website.gradle.GrailsWebsiteExtension
+
+@CompileStatic
+@CacheableTask
+abstract class BskyAtProtoDidTask extends GrailsWebsiteTask {
+
+    @Internal
+    final String description = 'Generates the .well-known/atproto-did file for Bsky'
+
+    public static final String NAME = 'genBskyAtProtoDid'
+
+    @InputFile
+    @PathSensitive(PathSensitivity.RELATIVE)
+    abstract RegularFileProperty getSocial()
+
+    @OutputFile
+    abstract RegularFileProperty getBskyAtProtoDid()
+
+    static TaskProvider<BskyAtProtoDidTask> register(
+            Project project,
+            GrailsWebsiteExtension siteExt,
+            String name = NAME
+    ) {
+        project.tasks.register(name, BskyAtProtoDidTask) {
+            it.social.set(siteExt.social)
+            it.bskyAtProtoDid.set(siteExt.bskyAtProtoDid)
+        }
+    }
+
+    @TaskAction
+    void generateAtProtoDid() {
+        bskyAtProtoDid.get().asFile.tap {
+            parentFile.mkdirs()
+            text = getBskyAtProtoDidText()
+        }
+    }
+
+    private Map getSocialProperties() {
+        File socialFile = social.get().asFile
+        socialFile.withInputStream { is -> new Yaml().load(is) } as Map
+    }
+
+    private String getBskyAtProtoDidText() {
+        try {
+            socialProperties['bsky']['did']
+        } catch (NullPointerException ignore) {
+            throw new GradleException('Missing property [bsky.did]')
+        }
+    }
+}

conf/social.yml

@@ -0,0 +1,3 @@
+bsky:
+  handle: '@grails.apache.org'
+  did: 'did:plc:5ad34hau6u4tw25cuh3cewwl'