Skip to content

Commit 345bf83

Browse files
matthewpwilsonmatthewpwilson
authored
Merge pull request #51 from pcoop/branch1
Template Profile and other Changes
2 parents e029c8d + 1197eb8 commit 345bf83

File tree

86 files changed

+13482
-5793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+13482
-5793
lines changed

‎Jenkinsfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def PRODUCT_NAME = "zowe-cli-cics-deploy-plugin"
7878
/**
7979
* This is where the Zowe project needs to be installed
8080
*/
81-
def ZOWE_CLI_INSTALL_DIR = "/.npm-global/lib/node_modules/@brightside/core"
81+
def ZOWE_CLI_INSTALL_DIR = "/.npm-global/lib/node_modules/@zowee/cli"
8282

8383
def ARTIFACTORY_CREDENTIALS_ID = "c8e3aa62-5eef-4e6b-8a3f-aa1006a7ef01"
8484

@@ -201,7 +201,8 @@ pipeline {
201201
echo "Install Zowe CLI globaly"
202202
sh("npm set registry https://registry.npmjs.org")
203203
sh("npm set @brightside:registry https://api.bintray.com/npm/ca/brightside/")
204-
sh("npm install -g @brightside/core@next")
204+
sh("npm set @zowe:registry https://api.bintray.com/npm/ca/brightside/")
205+
sh("npm install -g @zowe/cli@latest")
205206
sh("zowe --version")
206207
}
207208
}

‎__tests__/__resources__/ExampleBundle01/META-INF/cics.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
<define name="name1" type="type1" path="path1"/>
66
<define name="name2" type="type2" path="path2"></define>
77
<define name="name3" type="http://www.ibm.com/xmlns/prod/cics/bundle/NODEJSAPP" path="nodejsapps/Test.nodejsapp"></define>
8-
</manifest>
8+
</manifest>

‎__tests__/__resources__/ExampleBundle03/Artefact1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dummy content

‎__tests__/__resources__/ExampleBundle06/Artefact1

Whitespace-only changes.

‎__tests__/__resources__/ExampleBundle06/META-INF/cics.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<manifest xmlns="http://www.ibm.com/xmlns/prod/cics/bundle">
2+
<define name="single" type="type1" path="path1"/>
3+
</manifest>

‎__tests__/__src__/environment/TestEnvironment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
import {ISetupEnvironmentParms} from "./doc/parms/ISetupEnvironmentParms";
13-
import {ImperativeError, ImperativeExpect, IO, Logger, TextUtils} from "@brightside/imperative";
13+
import {ImperativeError, ImperativeExpect, IO, Logger, TextUtils} from "@zowe/imperative";
1414
import * as nodePath from "path";
1515
import {mkdirpSync} from "fs-extra";
1616
import {ITestEnvironment} from "./doc/response/ITestEnvironment";

‎__tests__/__system__/cli/generate/__snapshots__/cli.generate.bundle.system.test.ts.snap

Lines changed: 250 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,131 @@ exports[`cics-deploy generate bundle paramters should customise port in generate
6161
`;
6262
6363
exports[`cics-deploy generate bundle paramters should customise port in generated profile accord to args 3`] = `
64-
"# This is a profile for a CICS NODEJSAPP resource
65-
66-
# Import the provisioned configuration file for this NODEJSAPP,
67-
# this file must be created before this Bundle can be installed in CICS
68-
INCLUDE=&USSCONFIG;/nodejsapps/cics-nodejs-invoke.included.profile
69-
70-
# Set the PORT envionment variable, application code should reference this
71-
# value in preference to a hard-coded port number, the value references an
72-
# environment variable that will be configured within the provisioned configuration file.
64+
"#######################################################################
65+
# Node.js application profile: basic_nodejsapp.profile #
66+
# #
67+
# The Node.js application profile is used to configure how CICS #
68+
# controls the Node.js runtime, provide Node.js command line options, #
69+
# and to set environment variables for use by the application. #
70+
# #
71+
# Lines starting with # are treated as comments and ignored. #
72+
# Lines ending with \\\\ are continued on the next line. #
73+
# #
74+
# See topic \\"Node.js profile validation and properties\\" #
75+
# in the Knowledge Center: #
76+
# http://www.ibm.com/support/knowledgecenter/SSGMCP_5.5.0 #
77+
# #
78+
#######################################################################
79+
#
80+
# Symbol Substitution
81+
# -------------------
82+
#
83+
# Symbols are replaced with their value when the profile is read by
84+
# CICS. They are useful to avoid duplicating configuration in the
85+
# profile. Symbols start with & and end with ; characters. Environment
86+
# variables defined in the profile may also be used as symbols.
87+
#
88+
# The following symbols are provided:
89+
# &APPLID; => Applid of the CICS region.
90+
# &BUNDLE; => Name of the BUNDLE resource.
91+
# &BUNDLEID; => Bundle ID.
92+
# &CONFIGROOT; => Directory of the .nodejsapp CICS bundle part.
93+
# &DATE; => Date when the NODEJSAPP resource is enabled
94+
# (localtime), formatted as Dyymmdd.
95+
# &NODEJSAPP; => Name of the NODEJSAPP resource.
96+
# &TIME; => Time when the NODEJSAPP resource is enabled
97+
# (localtime), formatted as Thhmmss.
98+
# &USSCONFIG; => Value of the USSCONFIG SIT parameter.
99+
# &USSHOME; => Value of the USSHOME SIT parameter.
100+
#
101+
# Examples:
102+
# LOG_DIR=&WORK_DIR;/&APPLID;/&BUNDLEID;/&NODEJSAPP;
103+
# LOG_SUCCESS=&LOG_DIR;/success.txt
104+
# LOG_FAILURE=&LOG_DIR;/failure.txt
105+
#
106+
#**********************************************************************
107+
#
108+
# Required parameters
109+
# -------------------
110+
#
111+
# NODE_HOME specifies the location of IBM SDK for Node.js - z/OS.
112+
#
113+
# NODE_HOME=/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x
114+
#
115+
#
116+
# WORK_DIR specifies the root directory in which CICS will create log
117+
# files. The default value is /tmp. A value of . means the home
118+
# directory of the user id running the CICS job.
119+
#
120+
# WORK_DIR=.
121+
#
122+
#**********************************************************************
123+
#
124+
# Including files in the profile
125+
# ------------------------------
126+
#
127+
# %INCLUDE specifies a file to be included in this profile. The file can
128+
# contain common system-wide configuration that can then be maintained
129+
# separate to the application configuration. Symbols can be used when
130+
# specifying the file to be included.
131+
#
132+
# Examples:
133+
# %INCLUDE=/etc/cicsts/prodplex/nodejs/sdk.profile
134+
# %INCLUDE=&USSCONFIG;/nodejs/sdk.profile
135+
# %INCLUDE=&CONFIGROOT;/debug.profile
136+
#
137+
%INCLUDE=&USSCONFIG;/nodejsapps/general.profile
138+
#
139+
#**********************************************************************
140+
#
141+
# Optional parameters
142+
# -------------------
143+
#
144+
# NODEJSAPP_DISABLE_TIMEOUT specifies the time in milliseconds that
145+
# CICS will wait when attempting to disable a NODEJSAPP. If the process
146+
# has not terminated in this time then CICS will send a SIGKILL signal
147+
# to force the process to end. The default value is 10000 (10 seconds).
148+
#
149+
# Example:
150+
# NODEJSAPP_DISABLE_TIMEOUT=30000
151+
#
152+
#**********************************************************************
153+
#
154+
# Command line options
155+
# --------------------
156+
#
157+
# Options beginning with a hyphen will be included on the command line
158+
# when CICS starts the Node.js runtime. The command line options
159+
# accepted by Node.js are documented at:
160+
# https://nodejs.org/dist/latest-v6.x/docs/api/cli.html
161+
#
162+
# Example:
163+
# --trace-sync-io
164+
#
165+
#**********************************************************************
166+
#
167+
# Unix System Services Environment Variables
168+
# ------------------------------------------
169+
#
170+
# TZ specifies the local time zone in POSIX format in which the Node.js
171+
# application will run.
172+
#
173+
# Example:
174+
# TZ=CET-1CEST,M3.5.0,M10.5.0
175+
#
176+
#**********************************************************************
177+
#
178+
# Environment variables
179+
# ---------------------
180+
#
181+
# Environment variables will be set before CICS starts the Node.js
182+
# runtime. Use environment variables to pass configuration to the
183+
# Node.js application.
184+
#
185+
# Example:
186+
# PORT=9080
187+
#
188+
#**********************************************************************
73189
PORT=12345
74190
"
75191
`;
@@ -125,16 +241,131 @@ exports[`cics-deploy generate bundle should generate a bundle using defaults fro
125241
`;
126242
127243
exports[`cics-deploy generate bundle should generate a bundle using defaults from package.json 3`] = `
128-
"# This is a profile for a CICS NODEJSAPP resource
129-
130-
# Import the provisioned configuration file for this NODEJSAPP,
131-
# this file must be created before this Bundle can be installed in CICS
132-
INCLUDE=&USSCONFIG;/nodejsapps/cics-nodejs-invoke.included.profile
133-
134-
# Set the PORT envionment variable, application code should reference this
135-
# value in preference to a hard-coded port number, the value references an
136-
# environment variable that will be configured within the provisioned configuration file.
137-
PORT=&HTTP_PORT;
244+
"#######################################################################
245+
# Node.js application profile: basic_nodejsapp.profile #
246+
# #
247+
# The Node.js application profile is used to configure how CICS #
248+
# controls the Node.js runtime, provide Node.js command line options, #
249+
# and to set environment variables for use by the application. #
250+
# #
251+
# Lines starting with # are treated as comments and ignored. #
252+
# Lines ending with \\\\ are continued on the next line. #
253+
# #
254+
# See topic \\"Node.js profile validation and properties\\" #
255+
# in the Knowledge Center: #
256+
# http://www.ibm.com/support/knowledgecenter/SSGMCP_5.5.0 #
257+
# #
258+
#######################################################################
259+
#
260+
# Symbol Substitution
261+
# -------------------
262+
#
263+
# Symbols are replaced with their value when the profile is read by
264+
# CICS. They are useful to avoid duplicating configuration in the
265+
# profile. Symbols start with & and end with ; characters. Environment
266+
# variables defined in the profile may also be used as symbols.
267+
#
268+
# The following symbols are provided:
269+
# &APPLID; => Applid of the CICS region.
270+
# &BUNDLE; => Name of the BUNDLE resource.
271+
# &BUNDLEID; => Bundle ID.
272+
# &CONFIGROOT; => Directory of the .nodejsapp CICS bundle part.
273+
# &DATE; => Date when the NODEJSAPP resource is enabled
274+
# (localtime), formatted as Dyymmdd.
275+
# &NODEJSAPP; => Name of the NODEJSAPP resource.
276+
# &TIME; => Time when the NODEJSAPP resource is enabled
277+
# (localtime), formatted as Thhmmss.
278+
# &USSCONFIG; => Value of the USSCONFIG SIT parameter.
279+
# &USSHOME; => Value of the USSHOME SIT parameter.
280+
#
281+
# Examples:
282+
# LOG_DIR=&WORK_DIR;/&APPLID;/&BUNDLEID;/&NODEJSAPP;
283+
# LOG_SUCCESS=&LOG_DIR;/success.txt
284+
# LOG_FAILURE=&LOG_DIR;/failure.txt
285+
#
286+
#**********************************************************************
287+
#
288+
# Required parameters
289+
# -------------------
290+
#
291+
# NODE_HOME specifies the location of IBM SDK for Node.js - z/OS.
292+
#
293+
# NODE_HOME=/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x
294+
#
295+
#
296+
# WORK_DIR specifies the root directory in which CICS will create log
297+
# files. The default value is /tmp. A value of . means the home
298+
# directory of the user id running the CICS job.
299+
#
300+
# WORK_DIR=.
301+
#
302+
#**********************************************************************
303+
#
304+
# Including files in the profile
305+
# ------------------------------
306+
#
307+
# %INCLUDE specifies a file to be included in this profile. The file can
308+
# contain common system-wide configuration that can then be maintained
309+
# separate to the application configuration. Symbols can be used when
310+
# specifying the file to be included.
311+
#
312+
# Examples:
313+
# %INCLUDE=/etc/cicsts/prodplex/nodejs/sdk.profile
314+
# %INCLUDE=&USSCONFIG;/nodejs/sdk.profile
315+
# %INCLUDE=&CONFIGROOT;/debug.profile
316+
#
317+
%INCLUDE=&USSCONFIG;/nodejsapps/general.profile
318+
#
319+
#**********************************************************************
320+
#
321+
# Optional parameters
322+
# -------------------
323+
#
324+
# NODEJSAPP_DISABLE_TIMEOUT specifies the time in milliseconds that
325+
# CICS will wait when attempting to disable a NODEJSAPP. If the process
326+
# has not terminated in this time then CICS will send a SIGKILL signal
327+
# to force the process to end. The default value is 10000 (10 seconds).
328+
#
329+
# Example:
330+
# NODEJSAPP_DISABLE_TIMEOUT=30000
331+
#
332+
#**********************************************************************
333+
#
334+
# Command line options
335+
# --------------------
336+
#
337+
# Options beginning with a hyphen will be included on the command line
338+
# when CICS starts the Node.js runtime. The command line options
339+
# accepted by Node.js are documented at:
340+
# https://nodejs.org/dist/latest-v6.x/docs/api/cli.html
341+
#
342+
# Example:
343+
# --trace-sync-io
344+
#
345+
#**********************************************************************
346+
#
347+
# Unix System Services Environment Variables
348+
# ------------------------------------------
349+
#
350+
# TZ specifies the local time zone in POSIX format in which the Node.js
351+
# application will run.
352+
#
353+
# Example:
354+
# TZ=CET-1CEST,M3.5.0,M10.5.0
355+
#
356+
#**********************************************************************
357+
#
358+
# Environment variables
359+
# ---------------------
360+
#
361+
# Environment variables will be set before CICS starts the Node.js
362+
# runtime. Use environment variables to pass configuration to the
363+
# Node.js application.
364+
#
365+
# Example:
366+
# PORT=9080
367+
#
368+
#**********************************************************************
138369
"
139370
`;
140371

0 commit comments

Comments
 (0)