Merge branch 'master' into brig/changelog-2.17.0

Author: ibodrov

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,2 +1,19 @@
+# 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.
+wrapperVersion=3.3.2
+distributionType=only-script
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.mvn/wrapper/maven-wrapper.jar

@@ -5,5 +5,31 @@
 Prefer explicit binding using `com.google.inject.Module` over `@Named` annotations.
 Use `@Named` for top-level modules and server plugins.
 
-Some classes require explicit bindings using `Multibinder.newSetBinder`:
-- com.walmartlabs.concord.server.sdk.ScheduledTask
+Some classes require explicit binding using `Multibinder.newSetBinder`:
+- ApiDescriptor
+- AuditLogListener
+- AuthenticationHandler
+- BackgroundTask
+- Component
+- ContextHandlerConfigurator
+- CustomEnqueueProcessor
+- ExceptionMapper
+- Filter
+- FilterChainConfigurator
+- FilterHolder
+- GaugeProvider
+- HttpServlet
+- ModeProcessor
+- PolicyApplier
+- ProcessEventListener
+- ProcessLogListener
+- ProcessStatusListener
+- ProcessWaitHandler
+- Realm
+- RepositoryRefreshListener
+- RequestErrorHandler
+- ScheduledTask
+- SecretStore
+- ServletContextListener
+- ServletHolder
+- UserInfoProvider

.mvn/wrapper/maven-wrapper.properties

@@ -103,15 +103,15 @@ See the [examples](examples) directory.
 
 ## How To Release New Versions
 
-- perform the regular Maven release:
+- perform a regular Maven release:
   ```
   $ ./mvnw release:prepare release:perform
   ```
-- push the tags:
+- push the new tag:
   ```
-  $ git push --tags
+  $ git push origin RELEASE_TAG
   ```
-- sync to Central;
+- sync to [Central](https://central.sonatype.com/);
 - build and push the Docker images:
   ```
   $ git checkout RELEASE_TAG

NOTES.md

@@ -9,9 +9,9 @@
  * Licensed 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.
@@ -48,10 +48,18 @@ public AgentClientFactory(boolean useMaintenanceMode) {
     }
 
     public AgentClient create(Pod pod) {
-        if (useMaintenanceMode && pod.getStatus() != null && pod.getStatus().getPodIP() != null) {
+        if (useMaintenanceMode && isRunning(pod) && hasIP(pod)) {
             return new DefaultAgentClient(httpClient, pod.getStatus().getPodIP());
         } else {
             return new NopAgentClient();
         }
     }
+
+    private static boolean isRunning(Pod pod) {
+        return pod.getStatus() != null && "Running".equals(pod.getStatus().getPhase());
+    }
+
+    private static boolean hasIP(Pod pod) {
+        return pod.getStatus() != null && pod.getStatus().getPodIP() != null;
+    }
 }

README.md

@@ -0,0 +1,37 @@
+/*-
+ * *****
+ * Concord
+ * -----
+ * Copyright (C) 2017 - 2024 Walmart Inc.
+ * -----
+ * Licensed 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.
+ * =====
+ */
+
+import { fetchJson } from '../../common';
+import {TeamRole} from "../../org/team";
+
+export interface UserInfoTeam {
+    orgName: string;
+    teamName: string;
+    role: TeamRole;
+}
+
+export interface UserInfoEntry {
+    displayName: string;
+    teams?: UserInfoTeam[];
+    roles?: string[];
+    ldapGroups?: string[];
+}
+
+export const get = (): Promise<UserInfoEntry> => fetchJson(`/api/service/console/userInfo`);

agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/agent/AgentClientFactory.java

@@ -0,0 +1,111 @@
+/*-
+ * *****
+ * Concord
+ * -----
+ * Copyright (C) 2017 - 2024 Wal-Mart Store, Inc.
+ * -----
+ * Licensed 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.
+ * =====
+ */
+import * as React from 'react';
+import {
+    List,
+    ListContent,
+    ListDescription,
+    ListItem,
+    Loader
+} from 'semantic-ui-react';
+
+import { get as apiGet, UserInfoEntry } from '../../../api/profile/user';
+import { RequestErrorMessage } from '../../molecules';
+import { useApi } from '../../../hooks/useApi';
+import {Link} from "react-router-dom";
+
+export default () => {
+    const { data, error, isLoading } = useApi<UserInfoEntry>(apiGet, {
+        fetchOnMount: true
+    });
+
+    if (error) {
+        return <RequestErrorMessage error={error} />;
+    }
+
+    if (isLoading) {
+        return <Loader active={true} />;
+    }
+
+    if (!data) {
+        return <p>There are no User info available</p>;
+    }
+
+    return (
+        <div style={{padding: '.85714286em 1.14285714em'}}>
+            <h5>Name</h5>
+            <List divided={true} relaxed={true}>
+                <ListItem>
+                    <ListContent>
+                        <ListDescription>{data.displayName}</ListDescription>
+                    </ListContent>
+                </ListItem>
+            </List>
+
+
+            <h5>Roles</h5>
+            <List divided={true} relaxed={true}>
+                {data.roles && data.roles
+                    .sort((a, b) => a.localeCompare(b))
+                    .map((role, index) => (
+                    <ListItem key={index}>
+                        <ListContent>
+                            <ListDescription>{role}</ListDescription>
+                        </ListContent>
+                    </ListItem>
+                ))}
+            </List>
+
+            <h5>Teams</h5>
+            <List divided={true} relaxed={true}>
+                {data.teams && data.teams
+                    .sort((a, b) => {
+                        const aConcat = `${a.orgName}/${a.teamName}`;
+                        const bConcat = `${b.orgName}/${b.teamName}`;
+                        return aConcat.localeCompare(bConcat);
+                    })
+                    .map((team, index) => (
+                    <ListItem key={index}>
+                        <ListContent>
+                            <ListDescription>
+                                <Link to={`/org/${team.orgName}/team/${team.teamName}`}>{team.orgName} / {team.teamName} ({team.role})</Link>
+                            </ListDescription>
+                        </ListContent>
+                    </ListItem>
+                ))}
+            </List>
+
+            {data.ldapGroups && data.ldapGroups.length > 0 && (
+                <>
+                    <h5>LDAP Groups</h5>
+                    <List divided={true} relaxed={true}>
+                        {data.ldapGroups.map((group, index) => (
+                            <ListItem key={index}>
+                                <ListContent>
+                                    <ListDescription>{group}</ListDescription>
+                                </ListContent>
+                            </ListItem>
+                        ))}
+                    </List>
+                </>
+            )}
+        </div>
+    );
+};

console2/src/api/profile/user/index.tsx

@@ -98,5 +98,6 @@ export { default as TeamMemberList2 } from './TeamMemberList2';
 export { default as TeamRenameActivity } from './TeamRenameActivity';
 export { default as TopBar } from './TopBar';
 export { default as TriggeredByPopup } from './TriggeredByPopup';
+export { default as UserInfo } from './UserInfo';
 export { default as UserProcessActivity } from './UserProcessActivity';
 export { default as ValidateRepositoryPopup } from './ValidateRepositoryPopup';